More stats

torvald · torvald · commit 1eef8b9963de · 2019-06-28T23:53:04.000+02:00
diff --git a/index.html b/index.html
@@ -15,6 +15,7 @@
               dataType: 'json',
               success: function (data) {
                 displayGrid(data);
+                displayStats(data['simulation']);
               }
             });
         };
@@ -52,14 +53,15 @@
             ctx.lineWidth = parseInt(gridOptions.LinesSize);
             grid_size = 0;
             grid_size = parseInt(gridOptions.grid_size);
-            canvas.width  = grid_size * data[0].length;
-            canvas.height = grid_size * data.length;
-            for (x = 0; x < data[0].length; x += 1) {
-                for (y = 0; y < data.length; y += 1) {
+            var barn = data['barn'];
+            canvas.width  = grid_size * barn[0].length;
+            canvas.height = grid_size * barn.length;
+            for (x = 0; x < barn[0].length; x += 1) {
+                for (y = 0; y < barn.length; y += 1) {
                     var canvas_x = x * grid_size;
                     var canvas_y = y * grid_size;
-                    //ctx.fillText(data[x][y], canvas_x, canvas_y);
-                    var agents = data[y][x];
+                    //ctx.fillText(barn[x][y], canvas_x, canvas_y);
+                    var agents = barn[y][x];
                     if (agents.length === 0) { continue; }
                     agents.sort((a, b) => a.weight - b.weight);
                     agent_type = agents[0]['type'];
@@ -73,19 +75,24 @@
                         if (agent['type'] === 'F') { ctx.drawImage(image('feeder'), canvas_x, canvas_y, grid_size, grid_size); }
                         if (agent['type'] === 'K') { ctx.drawImage(image('cow'), canvas_x, canvas_y, grid_size, grid_size); }
                         if (agent['type'] === 'X') { ctx.drawImage(image('cow_dead'), canvas_x, canvas_y, grid_size, grid_size); }
+                        if (agent['type'] === '*') { ctx.fillText("*", canvas_x, canvas_y) ;}
                         if (agent['debug']) { ctx.fillText("debug-ku", canvas_x, canvas_y); }
                     }
                 }
             }
         }
     }
+    function displayStats(data) {
+        $('#stats').html(JSON.stringify(data, null, "<br>"));
+    }
     </script>
 </head>
 
 <body onload="">
     <h2>Cowsim</h2>
-    <canvas id="barn" width="" height="">
+    <canvas id="barn" width="" height="" style="border:1px solid black;">
     </canvas>
+    <div id="stats"></div>
     <br />
     Options:
     <select id="" onchange="">
diff --git a/main.py b/main.py
@@ -88,7 +88,7 @@ def place_random_agents(agent_type, groups, max_agents, cluster=False):
                         self.barn.place_agent(Bed(self), (x, y))
                         self.barn.sleep_positions.append((x,y))
 
-        place_random_agents('wall', groups=10, max_agents=10)
+        place_random_agents('wall', groups=30, max_agents=10)
         place_random_agents('grass', groups=5, max_agents=5)
         place_random_agents('water', groups=5, max_agents=3)
         place_random_agents('feeder', groups=5, max_agents=2)
@@ -107,27 +107,33 @@ def place_random_agents(agent_type, groups, max_agents, cluster=False):
     def random_pos(self):
         x = random.randrange(config["barn_height"])
         y = random.randrange(config["barn_width"])
+        while not self.barn.is_cell_empty((x,y)):
+            x = random.randrange(config["barn_height"])
+            y = random.randrange(config["barn_width"])
         return (x, y)
 
     def state(self):
         debug_cow = next(cow for cow in self.cows if cow.debug)
         dead = len([cow for cow in self.cows if not cow.alive])
-        water = [cow.water for cow in self.cows]
-        # print("Mean:", numpy.mean(results), " Median:", numpy.median(results), " Stdev:", numpy.std(results))
+        water = [cow.water for cow in self.cows if cow.alive]
+        stuck_recalc = [cow.stuck_recalc for cow in self.cows if cow.alive]
         return {
             "model": {
                 "dead": dead,
                 "water_mean": numpy.mean(water),
                 "water_median": numpy.median(water),
                 "water_stdev": numpy.std(water),
+                "stuck_recalc_mean": numpy.mean(stuck_recalc),
+                "stuck_recalc_median": numpy.median(stuck_recalc),
+                "stuck_recalc_stdev": numpy.std(stuck_recalc),
+                "step": self.step,
             },
-            "barn": self.barn.state(),
-            "step": self.step,
             "debug_cow": debug_cow,
+            "barn": self.barn.state(),
         }
 
     def human_readable_state(self, state):
-        output = "Step: {}\n".format(state["step"])
+        output = "Step: {}\n".format(state['model']["step"])
         grid = state["barn"]["grid"]
         debug_cow_path = state["debug_cow"].current_path
         debug_cow_state = state["debug_cow"].state()
@@ -152,19 +158,19 @@ def json_state(self, state):
         grid = state["barn"]["grid"]
         debug_cow_path = state["debug_cow"].current_path
         debug_cow_state = state["debug_cow"].state()
-        model = state["model"]
         w, h = len(grid), len(grid[0])
-        to_json = [[[] for x in range(h)] for y in range(w)]
+        grid_json = [[[] for x in range(h)] for y in range(w)]
         for x in range(len(grid)):
             for y in range(len(grid[x])):
                 if grid[x][y]:
-                    to_json[x][y] = [a.state() for a in grid[x][y]]
+                    grid_json[x][y] = [a.state() for a in grid[x][y]]
                 elif (x, y) in debug_cow_path:
-                    to_json[x][y] = []
+                    grid_json[x][y] = [{'type': '*'}]
                 else:
-                    to_json[x][y] = []
+                    grid_json[x][y] = []
 
-        return to_json
+        return {'barn': grid_json,
+                'simulation': state['model']}
 
     def run(self):
         for s in range(self.config["steps"]):
