made changes to reproduce commit 2217010

scioip34 · May 13, 2024 · e497057 · e497057
1 parent 7ea5304
commit e497057
Show file tree

Hide file tree

Showing 25 changed files with 63 additions and 787 deletions.
diff --git a/abm/agent/agent.py b/abm/agent/agent.py
@@ -473,8 +473,6 @@ def projection_field(self, obstacles, keep_distance_info=False, non_expl_agents=
         # extracting obstacle coordinates
         obstacle_coords = [ob.position for ob in obstacles]
 
-
-
         # if non-social cues can visually exclude social ones we also concatenate these to the obstacle coords
         if non_expl_agents is not None:
             len_social = len(obstacles)
@@ -598,7 +596,6 @@ def projection_field(self, obstacles, keep_distance_info=False, non_expl_agents=
         v_field_post[phis < fov[0]] = 0
         v_field_post[phis > fov[1]] = 0
 
-
         return v_field_post
 
     def rank_V_source_data(self, ranking_key, reverse=True):

diff --git a/abm/app_madrl_foraging.py b/abm/app_madrl_foraging.py
@@ -110,7 +110,11 @@ def start(parallel=True, headless=False):
         sim = Simulation(parallel=parallel,**sim_params)
 
         #sim.write_batch_size = 100
-        _ = sim.start_madqn()
+        if envconf["BRAIN_TYPE"] == "ideal":
+            _ = sim.start_heuristic()
+        else:
+            _ = sim.start_madqn()
+
 
 if __name__ == '__main__':
     start()

diff --git a/abm/data/metaprotocol/experiments/MADRLExp0N3R100M10V2.py b/abm/data/metaprotocol/experiments/MADRLExp0N3R100M10V2.py
diff --git a/abm/data/metaprotocol/experiments/MADRLExp0N3R100M8V2.py b/abm/data/metaprotocol/experiments/MADRLExp0N3R100M8V2.py