Merge branch 'dev' into main_changes_merge

Author: hsl-petrhaj

Scripts/assignment/emme_assignment.py

@@ -478,11 +478,9 @@ def calc_noise(self) -> pandas.Series:
             link = morning_network.link(link.i_node, link.j_node)
             rlink = link.reverse_link
             if reverse_traffic > 0:
-                speed = (60 * 2 * link.length
-                         / (link["@car_time_aht"]+rlink["@car_time_aht"]))
+                speed = (60 * 2 * link.length/(link["@car_time_aht"]+rlink["@car_time_aht"])) if rlink["@car_time_aht"] > 0.0 else 50.0
             else:
-                speed = (0.3*(60*link.length/link["@car_time_aht"])
-                         + 0.7*link.data2)
+                speed = (0.3*(60*link.length/link["@car_time_aht"]) + 0.7*link.data2) if link["@car_time_aht"] > 0.0 else 50.0
             speed = max(speed, 50.0)
 
             # Calculate start noise

Scripts/cba.py

@@ -32,6 +32,12 @@
     "train": ("HSL-juna-2", "muu_juna", "HSL-juna-1", "HSL-juna-3"),
     "tram": ("ratikka", "pikaratikk"),
 }
+TRANSIT_AGGREGATIONS_FALLBACK = {
+    "bus": ("HSL-bussi", "ValluVakio", "ValluPika"),
+    "trunk": ("HSL-runkob", ),
+    "train": ("HSL-juna", "muu_juna"),
+    "tram": ("ratikka", "pikaratikk"),
+}
 
 TRANSLATIONS = {
     "car_work": "ha_tyo",
@@ -209,13 +215,18 @@ def run_cost_benefit_analysis(scenario_0, scenario_1, year, workbook):
     noise_diff = read(NOISE_FILE, scenario_1) - read(NOISE_FILE, scenario_0)
     ws[CELL_INDICES["noise"][year]] = sum(noise_diff["population"])
 
+    transit_vehicle_kms_tables = [read(TRANSIT_KMS_FILE, scenario_0), read(TRANSIT_KMS_FILE, scenario_1)]
+    for transit_vehicle_kms in transit_vehicle_kms_tables:
+        if all(submode in transit_vehicle_kms.index for submodes in TRANSIT_AGGREGATIONS.values() for submode in submodes):
+            transit_aggs = TRANSIT_AGGREGATIONS
+        else:
+            transit_aggs = TRANSIT_AGGREGATIONS_FALLBACK
+        for mode in transit_aggs:
+            transit_vehicle_kms.loc[mode] = 0  # Change aggregated mode to 0
+            for submode in transit_aggs[mode]:  # Go through the submodes and add their values to the aggregated mode
+                transit_vehicle_kms.loc[mode] += transit_vehicle_kms.loc[submode]
     # Calculate transit mile differences
-    transit_mile_diff = (read(TRANSIT_KMS_FILE, scenario_1)
-                         - read(TRANSIT_KMS_FILE, scenario_0))
-    for mode in TRANSIT_AGGREGATIONS:
-        transit_mile_diff.loc[mode] = 0
-        for submode in TRANSIT_AGGREGATIONS[mode]:
-            transit_mile_diff.loc[mode] += transit_mile_diff.loc[submode]
+    transit_mile_diff = transit_vehicle_kms_tables[1] - transit_vehicle_kms_tables[0]
     ws = workbook["Tuottajahyodyt"]
     cols = CELL_INDICES["transit_miles"]["cols"]
     rows = CELL_INDICES["transit_miles"]["rows"][year]
@@ -419,6 +430,13 @@ def calc_revenue(demands, costs):
         help="Path to Results directory.")
     args = parser.parse_args()
     log.initialize(args)
+    
+    matching_vehicle_kms_cols = list(read(VEHICLE_KMS_FILE, args.baseline_scenario).columns) == list(read(VEHICLE_KMS_FILE, args.projected_scenario).columns)
+    matching_transit_kms_rows = list(read(TRANSIT_KMS_FILE, args.baseline_scenario).index) == list(read(TRANSIT_KMS_FILE, args.projected_scenario).index)
+    if not (matching_vehicle_kms_cols and matching_transit_kms_rows):
+        msg = "The data structure of transit_kms.txt or vehicle_kms_vdf.txt is different between scenarios. Check the results folders of scenarios being compared."
+        log.error(msg)
+        raise KeyError(msg)
     wb = load_workbook(os.path.join(SCRIPT_DIR, "CBA_kehikko.xlsx"))
     results = run_cost_benefit_analysis(
         args.baseline_scenario, args.projected_scenario, 1, wb)

Scripts/helmet.py

@@ -123,7 +123,8 @@ def log_header(msg, log_width=72):
     if args.is_agent_model:
         model = AgentModelSystem(
             forecast_zonedata_path, base_zonedata_path, base_matrices_path,
-            results_path, ass_model, args.scenario_name, estimation_data_path)
+            results_path, ass_model, args.scenario_name, event_handler, 
+            estimation_data_path)
     else:
         model = ModelSystem(
             forecast_zonedata_path, base_zonedata_path, base_matrices_path,

Scripts/helmet_validate_inputfiles.py

@@ -183,7 +183,10 @@ def main(args):
             # Check if emmebank has scenarios with different zone numbers
             scenarios_with_different_zones = 0
             for scen in emmebank.scenarios():
-                if scen.zone_numbers != zone_numbers:
+                compared_zone_numbers = scen.zone_numbers
+                if compared_zone_numbers < 1:  # Skip empty scenarios
+                    continue
+                if compared_zone_numbers != zone_numbers:
                     scenarios_with_different_zones += 1
             if scenarios_with_different_zones > 0:
                 log.warn(f"{scenarios_with_different_zones} Scenarios with different zones found in EMME bank! Matrices will not be compatible between scenarios with different zones.")

Scripts/models/park_and_ride_model.py

@@ -240,15 +240,15 @@ def _get_facility_utilities(self) -> np.ndarray:
         return np.array([f.cost * facility_cost_w + f.time * facility_time_w + f.extra_utility for f in self._facilities])[None, None, :]
 
     def _calc_extra_utility(self, impedance: Dict[str, Dict[str, Dict[str, np.ndarray]]]):
-        """Calculate extra utility for each facility based on the number of shops within 1 km.
+        """Calculate extra utility for each facility based on the number of shops within x km.
         Does nothing if there are no facilities or if the extra utility has already been calculated.
 
         Args:
             impedance (Dict[str, Dict[str, Dict[str, np.ndarray]]]): Impedance matrices
         """
         if len(self._facilities) == 0 or self._facilities[0].extra_utility is not None:
             return
-        SHOP_SEARCH_RADIUS = 3.0 # Include shops within 1 km
+        SHOP_SEARCH_RADIUS = 3.0 # Include shops within x km
         try:
             shop_weight = destination_choice[self._purpose.name]['park_and_ride']['utility']['facility']['shops']
         except KeyError:

Scripts/parameters/assignment.py

@@ -97,7 +97,7 @@
     "hmaf": (800000, 800500),
     "hrjasf": (801000, 801500),
     "htpaf": (802000, 806000),
-    "hpaf": (810000, 816000),
+    "htpaf": (810000, 816000),
 }
 vdf_temp = ("(put(60/ul2)*(1+{}*put((volau+volad)/{})/"
             + "(ul1-get(2))))*(get(2).le.put(ul1*{}))*length+(get(2).gt."

Scripts/tests/test_data/Network/base_network_test.txt

@@ -547,7 +547,7 @@ a 310493         25474182          6682152       0       0      49 C
 a 310494         25474153          6682117       0       0      49 C
 a 310495         25474593          6681914       0       0      49 C
 a 310496         25474577          6681880       0       0      49 C
-a 321079  25433589.837194   6698120.349799       0      20     428 O
+a 321079  25433589.837194   6698120.349799       0      20     444 O
 a 321090  25428709.603729   6696148.266151       0      20     734 O
 a 321091    25421975.1812   6698283.299535       0      20     734 O
 a 321092  25414689.484996   6697591.407689       0      20     734 O
@@ -635,7 +635,7 @@ a   6291 179244  1.1744 hcvkyaf       99 1.0  99    1000     100 .469970
 a  19071 300018  2.0896 hcvkaf        99 1.0  99       0       0       0
 a  34102 321095 10.3859 hcvkyasf      98 1.0  99    1000     100       0
 a  34500 200843 .097100 hcvkyasf      87 1.0  99    1000     100 27.4636
-a  35039 224410 .118611 hcvkyaf      140 1.0   5     900      36       0
+a  35039 224410 .118611 hcvkyaf       84 1.0   5     900      36       0
 a  40222  40226 .133000 hcvkybgde    129 1.0   2    1850      81 45.9068
 a  40223 197014  1.0117 hcvkybgde    124 3.0   1    1700      97 201.129
 a  40224  50074 .359200 hcvkybgde    124 3.0   1    1700      97 189.548
@@ -1480,7 +1480,7 @@ a 223753 238903 .093600 hcvkybgdeaf  134 2.0   3    1250      54 89.3543
 a 223753 321597 .297300 hcvkybgdeaf  134 2.0   3    1250      54 66.3284
 a 224389 238904 .064800 hcvkybgdeaf  134 2.0   3    1250      54 66.3284
 a 224389 321597 .162600 hcvkybgdeaf  134 2.0   3    1250      54 82.6334
-a 224410  35039 .118611 hcvkyaf      140 1.0   5     900      36       0
+a 224410  35039 .118611 hcvkyaf       84 1.0   5     900      36       0
 a 224410 197084 .040100 hcvkybgdeaf  134 3.0   3    1250      54  89.632
 a 224410 238903 .077100 hcvkybgdeaf  134 2.0   3    1250      54 71.5573
 a 224410 801035 .090100 haf           70 1.0   0       0       0       0

Scripts/utils/calc_noise.py

@@ -49,11 +49,9 @@ def calc_noise(self, link):
         link = self.morning_network.link(link.i_node, link.j_node)
         rlink = link.reverse_link
         if reverse_traffic > 0:
-            speed = (60 * 2 * link.length
-                     / (link[self.car_morning]+rlink[self.car_morning]))
+            speed = (60 * 2 * link.length/(link[self.car_morning]+rlink[self.car_morning])) if rlink[self.car_morning] > 0 else 50.0
         else:
-            speed = (0.3*(60*link.length/link[self.car_morning])
-                     + 0.7*link.data2)
+            speed = (0.3*(60*link.length/link[self.car_morning]) + 0.7*link.data2) if link[self.car_morning] > 0 else 50.0
         speed = max(speed, 50.0)
 
         # Calculate start noise

Scripts/utils/validate_network.py

@@ -139,7 +139,13 @@ def validate(network, fares=None):
                         timeperiod, link.id)
                     log.error(msg)
                     raise ValueError(msg)
-                
+        
+        if (link.i_node.is_centroid or link.j_node.is_centroid) and link.type not in param.connector_link_types:
+            msg = "Link {} is a connector and must be one of the connector link types: {}".format(
+                link.id, param.connector_link_types)
+            log.error(msg)
+            raise ValueError(msg)
+
         if link.i_node.is_centroid and link.j_node.is_centroid:
             msg = "Link {} is leading directly from centroid node {} to centroid node {}. This is not allowed.".format(link.id,link.i_node.number,link.j_node.number)
             log.error(msg)