set output_dir parameter for agents-networks gis example

EwoutH · Sep 3, 2024 · 679b677 · 679b677
1 parent f24626e
commit 679b677
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/gis/agents_and_networks/scripts/run.py b/gis/agents_and_networks/scripts/run.py
@@ -39,6 +39,7 @@ def make_parser():
         "lakes_file": f"data/{args.campus}/hydrop.zip",
         "rivers_file": f"data/{args.campus}/hydrol.zip",
         "driveway_file": f"data/{args.campus}/{data_file_prefix}_Rds.zip",
+        "output_dir": "outputs",
         "show_walkway": True,
         "show_lakes_and_rivers": True,
         "show_driveway": True,

diff --git a/gis/agents_and_networks/src/model/model.py b/gis/agents_and_networks/src/model/model.py
@@ -69,6 +69,7 @@ def __init__(
         lakes_file=script_directory / "../../data/ub/hydrop.zip",
         rivers_file=script_directory / "../../data/ub/hydrol.zip",
         driveway_file=script_directory / "../../data/data/ub/UB_Rds.zip",
+        output_dir=script_directory / "../../outputs",
         num_commuters=50,
         commuter_min_friends=5,
         commuter_max_friends=10,
@@ -97,7 +98,9 @@ def __init__(
         Commuter.CHANCE_NEW_FRIEND = chance_new_friend
 
         self._load_buildings_from_file(buildings_file, crs=model_crs, campus=campus)
-        self._load_road_vertices_from_file(walkway_file, crs=model_crs, campus=campus)
+        self._load_road_vertices_from_file(
+            walkway_file, crs=model_crs, campus=campus, output_dir=output_dir
+        )
         self._set_building_entrance()
         self.got_to_destination = 0
         self._create_commuters()
@@ -167,14 +170,16 @@ def _load_buildings_from_file(
         self.space.add_buildings(buildings)
 
     def _load_road_vertices_from_file(
-        self, walkway_file: str, crs: str, campus: str
+        self, walkway_file: str, crs: str, campus: str, output_dir: str
     ) -> None:
         walkway_df = (
             gpd.read_file(walkway_file)
             .set_crs(self.data_crs, allow_override=True)
             .to_crs(crs)
         )
-        self.walkway = CampusWalkway(campus=campus, lines=walkway_df["geometry"])
+        self.walkway = CampusWalkway(
+            campus=campus, lines=walkway_df["geometry"], output_dir=output_dir
+        )
         if self.show_walkway:
             walkway_creator = mg.AgentCreator(Walkway, model=self)
             walkway = walkway_creator.from_GeoDataFrame(walkway_df)

diff --git a/gis/agents_and_networks/src/space/road_network.py b/gis/agents_and_networks/src/space/road_network.py
@@ -64,10 +64,10 @@ class CampusWalkway(RoadNetwork):
         list[mesa.space.FloatCoordinate],
     ]
 
-    def __init__(self, campus, lines) -> None:
+    def __init__(self, campus, lines, output_dir) -> None:
         super().__init__(lines)
         self.campus = campus
-        self._path_cache_result = f"outputs/{campus}_path_cache_result.pkl"
+        self._path_cache_result = f"{output_dir}/{campus}_path_cache_result.pkl"
         try:
             with open(self._path_cache_result, "rb") as cached_result:
                 self._path_select_cache = pickle.load(cached_result)