refactor uncongested travel time calculation

Author: jalovaj2

Scripts/assignment/assignment_period.py

@@ -160,7 +160,7 @@ def assign(self, matrices: dict, iteration: Union[int,str]) -> Dict:
             raise ValueError("Iteration number not valid")
 
         mtxs = {imp_type: self._get_matrices(imp_type, iteration=="last")
-            for imp_type in ("time", "cost", "dist", "congest_time")}
+            for imp_type in ("time", "cost", "dist")}
         # fix the emme path analysis results
         # (dist and cost are zero if path not found but we want it to
         # be the default value 999999)
@@ -483,6 +483,9 @@ def _get_matrices(self,
                 matrices[ass_class] = mtx
         if not (param.always_congested or is_last_iteration):
             matrices["transit_leisure"] = matrices["transit_work"]
+        if mtx_type == "time" and param.always_congested:
+            matrices["transit_leisure_uncongested"] = matrices["transit_leisure"] - self._get_matrix("transit_leisure", "congest_time")
+            matrices["transit_work_uncongested"] = matrices["transit_work"] - self._get_matrix("transit_work", "congest_time")
         return matrices
 
     def _get_matrix(self, 
@@ -830,7 +833,7 @@ def _assign_congested_transit(self):
             stopping_criteria=param.trass_stop,
             log_worksheets=False, scenario=self.emme_scenario,
             save_strategies=True)
-        # save uncongested results for both both classes
+        # save congested travel times for both classes
         for tc in specs:
             self.emme_project.strategy_analysis(
                 specs[tc].strategy_analysis_spec, scenario=self.emme_scenario,

Scripts/assignment/mock_assignment.py

@@ -91,7 +91,7 @@ def assign(self,
                 mtx[ass_class] = matrices[ass_class]
         log.info("Saved demand matrices for " + str(self.name))
         mtxs = {mtx_type: self._get_matrices(mtx_type)
-            for mtx_type in ("time", "cost", "dist", "congest_time")}
+            for mtx_type in ("time", "cost", "dist")}
         for ass_cl in ("transit_work", "transit_leisure"):
             mtxs["time"][ass_cl] = mtxs["time"]["transit_uncongested"]
         if iteration != "last":

Scripts/modelsystem.py

@@ -322,10 +322,7 @@ def run_iteration(self, previous_iter_impedance, iteration=None):
             impedance[tp] = ap.assign(self.dtm.demand[tp], iteration)
             if tp == "aht":
                 self._update_ratios(impedance[tp], tp)
-            if iteration=="last" and param.always_congested:
-                impedance[tp]["time"]["transit_uncongested_work"] = impedance[tp]["time"]["transit_work"] - impedance[tp]["congest_time"]["transit_work"]
-                impedance[tp]["time"]["transit_uncongested_leisure"] = impedance[tp]["time"]["transit_leisure"] - impedance[tp]["congest_time"]["transit_leisure"]
-                impedance[tp].pop("congest_time")                
+            if iteration=="last" and param.always_congested:     
                 self._save_to_omx(impedance[tp], tp)
             elif iteration=="last":
                 impedance[tp]["time"]["transit_uncongested"] = previous_iter_impedance[tp]["time"]["transit_work"]