Merge pull request #138 from BayAreaMetro/minor-transit-updates

Minor Transit Edits
BayAreaMetro · Feb 22, 2024 · 681a6fc · 681a6fc
2 parents 0d1d1a0 + 9687235
commit 681a6fc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tm2py/components/network/transit/transit_skim.py b/tm2py/components/network/transit/transit_skim.py
@@ -134,6 +134,7 @@ def skim_properties(self):
                 ("WEGR", "egress walk time"),
                 ("IVT", "total in-vehicle time"),
                 ("IN_VEHICLE_COST", "in-vehicle cost"),
+                ("CROWD", "Crowding penalty")
             ]
             self._skim_properties += [
                 Skimproperty(_name, _desc) for _name, _desc in _basic_skims
@@ -151,15 +152,13 @@ def skim_properties(self):
                 self._skim_properties.extend(
                     [
                         Skimproperty("LINKREL", "Link reliability"),
-                        Skimproperty("CROWD", "Crowding penalty"),
                         Skimproperty("EAWT", "Extra added wait time"),
                         Skimproperty("CAPPEN", "Capacity penalty"),
                     ]
                 )
             if self.config.congested_transit_assignment:
                 self._skim_properties.extend(
                     [
-                        Skimproperty("CROWD", "Crowding penalty"),
                         Skimproperty("TRIM", "used to trim demands"),
                         Skimproperty("XBOATIME", "transfer boarding time penalty"),
                         Skimproperty("DTOLL", "drive access or egress toll price"),
@@ -620,7 +619,7 @@ def skim_drive_walk(
                     "type": "MATRIX_CALCULATION",
                     "constraint": None,
                     "result": f'mf"{_tp_tclass}_DTIME"',
-                    "expression": f'mf"{_tp_tclass}_DTIME" - 60*mf"{_tp_tclass}_DTOLL"/{vot}',
+                    "expression": f'mf"{_tp_tclass}_DTIME"',
                 },
                 {
                     "type": "MATRIX_CALCULATION",