X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=maze.py;h=d09e860b4c500587ce6f1eba5f873fecf5812aca;hb=d63c681fdb2d6b5590991eaa4a2d9a5376678c67;hp=754cdeab2728b756bae6c17d017f1c95e680214d;hpb=ffc0a92cddefa9fda9f25468c25ae1365b52be47;p=beaver.git

diff --git a/maze.py b/maze.py
index 754cdea..d09e860 100755
--- a/maze.py
+++ b/maze.py
@@ -61,11 +61,11 @@ def create_maze(h=11, w=17, nb_walls=8):
 ######################################################################
 
 
-def compute_distance(walls, i, j):
+def compute_distance(walls, goal_i, goal_j):
     max_length = walls.numel()
     dist = torch.full_like(walls, max_length)
 
-    dist[i, j] = 0
+    dist[goal_i, goal_j] = 0
     pred_dist = torch.empty_like(dist)
 
     while True:
@@ -93,8 +93,8 @@ def compute_distance(walls, i, j):
 ######################################################################
 
 
-def compute_policy(walls, i, j):
-    distance = compute_distance(walls, i, j)
+def compute_policy(walls, goal_i, goal_j):
+    distance = compute_distance(walls, goal_i, goal_j)
     distance = distance + walls.numel() * walls
 
     value = distance.new_full((4,) + distance.size(), walls.numel())
@@ -110,6 +110,24 @@ def compute_policy(walls, i, j):
     return proba
 
 
+def stationary_densities(mazes, policies):
+    start = (mazes == v_start).nonzero(as_tuple=True)
+    probas = mazes.new_zeros(mazes.size())
+    pred_probas = probas.clone()
+    probas[start] = 1.0
+
+    while not pred_probas.equal(probas):
+        pred_probas.copy_(probas)
+        probas.zero_()
+        probas[:, 1:, :] = pred_probas[:, :-1, :] * policies[:, 0, :-1, :]
+        probas[:, :-1, :] = pred_probas[:, 1:, :] * policies[:, 1, 1:, :]
+        probas[:, :, 1:] = pred_probas[:, :, :-1] * policies[:, 2, :, :-1]
+        probas[:, :, :-1] = pred_probas[:, :, 1:] * policies[:, 3, :, 1:]
+        probas[start] = 1.0
+
+    return probas
+
+
 ######################################################################
 
 
@@ -200,7 +218,7 @@ def save_image(
             [255, 255, 255],  # empty
             [0, 0, 0],  # wall
             [0, 255, 0],  # start
-            [0, 0, 255],  # goal
+            [127, 127, 255],  # goal
             [255, 0, 0],  # path
         ]
     )
@@ -238,7 +256,7 @@ def save_image(
         c_score_paths = score_paths.unsqueeze(1).expand(-1, 3, -1, -1)
         c_score_paths = (
             c_score_paths * colors[4].reshape(1, 3, 1, 1)
-            + (1 - c_score_paths) * colors[3].reshape(1, 3, 1, 1)
+            + (1 - c_score_paths) * colors[0].reshape(1, 3, 1, 1)
         ).long()
         c_score_paths = c_score_paths * (mazes.unsqueeze(1) == v_empty) + c_mazes * (
             mazes.unsqueeze(1) != v_empty