Added printing of park and ride facility information to results folder

Author: s-hiitola

Scripts/models/park_and_ride_model.py

@@ -33,6 +33,7 @@ class ParkAndRideFacility:
     time: float
     used_capacity: float
     adjustments: int
+    shops: int = 0
     extra_utility: float = None
 
 class ParkAndRideUtilities(NamedTuple):
@@ -255,6 +256,7 @@ def _calc_extra_utility(self, impedance: Dict[str, Dict[str, Dict[str, np.ndarra
 
         for facility in self._facilities:
             dist_mask = impedance['aht']['dist']['walk'][facility.zone_offset,0:self._zone_data.nr_zones] < SHOP_SEARCH_RADIUS
+            facility.shops = self._zone_data['shops'][dist_mask].sum()
             facility.extra_utility = self._zone_data['shops'][dist_mask].sum() * shop_weight
 
     @staticmethod

Scripts/modelsystem.py

@@ -10,6 +10,7 @@
 from assignment.abstract_assignment import AssignmentModel
 from assignment.emme_assignment import EmmeAssignmentModel
 from assignment.mock_assignment import MockAssignmentModel
+from dataclasses import asdict
 
 import utils.log as log
 from utils.zone_interval import ArrayAggregator
@@ -167,14 +168,15 @@ def _add_internal_demand(self, previous_iter_impedance, is_last_iteration):
                             purpose.calc_prob(saved_pnr_impedance[purpose.name])
                             demand = purpose.calc_demand()
                             log.debug(f"Park and ride crowding penalty iteration {i+1} modified {modified} facilities.")
-                            if modified < 1:
+                            if modified < 1:                                
                                 break
+                        log.debug(f"Park and ride demand calculation completed.")
 
                 if purpose.dest != "source":
                     for mode in demand:
                         self.dtm.add_demand(demand[mode])
                         self.travel_modes[mode] = True
-        log.info("Demand calculation completed")
+        log.info("Demand calculation completed")            
 
     # possibly merge with init
     def assign_base_demand(self, 
@@ -353,6 +355,7 @@ def run_iteration(self, previous_iter_impedance, iteration=None):
                 self._save_to_omx(impedance[tp], tp)
         if iteration=="last":
             self.ass_model.aggregate_results(self.resultdata)
+            self._save_pnr_facility_info()
             self._calculate_noise_areas()
             self._calculate_accessibility_and_savu_zones()
             self.resultdata.print_line("\nMode shares", "result_summary")
@@ -389,6 +392,23 @@ def _save_to_omx(self, impedance, tp):
                 for ass_class in impedance[mtx_type]:
                     mtx[ass_class] = impedance[mtx_type][ass_class]
 
+    def _save_pnr_facility_info(self):
+        pnr_data = []
+        for facility in self.dm.purpose_dict['hw'].park_and_ride_model._facilities:
+            pnr_data.append({k: str(v) for k, v in asdict(facility).items()})
+
+        pnr_results = pandas.DataFrame(pnr_data)
+        print(pnr_results.head())
+        pnr_results['used_capacity'] = pnr_results['used_capacity'].astype(float).round().astype(int)
+        pnr_results['shops'] = pnr_results['shops'].astype(float).round().astype(int)
+        pnr_results.index = pnr_results['zone_id']
+        pnr_results.index.name = None
+        pnr_results = pnr_results[['cost','shops','capacity','used_capacity','time']]
+        print(pnr_results.head())
+        for col in pnr_results.columns:
+            self.resultdata.print_data(pnr_results[col], "pnr_facilities.txt", col)
+
+
     def _calculate_noise_areas(self):
         noise_areas = self.ass_model.calc_noise()
         self.resultdata.print_data(noise_areas, "noise_areas.txt", "area")