diff --git a/tm2py/components/network/transit/transit_skim.py b/tm2py/components/network/transit/transit_skim.py index 4a0c870d..a2c6a017 100644 --- 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,7 +152,6 @@ 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"), ] @@ -159,7 +159,6 @@ def skim_properties(self): 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",