Skip to content

Commit 9a243a4

Browse files
committed
Removing dead code of the old "so" model (HS15 home-source)
1 parent 9a33598 commit 9a243a4

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

Scripts/datatypes/purpose.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ def __init__(self, specification, zone_data, resultdata):
115115
self.gen_model = generation.GenerationModel(self, resultdata)
116116
if self.name == "sop":
117117
self.model: Union[logit.OriginModel, logit.DestModeModel, logit.ModeDestModel] = logit.OriginModel(zone_data, self, resultdata)
118-
elif self.name == "so":
119-
self.model = logit.DestModeModel(zone_data, self, resultdata)
120118
else:
121119
self.model = logit.ModeDestModel(zone_data, self, resultdata)
122120
self.accessibility_model = logit.AccessibilityModel(

Scripts/modelsystem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def _add_internal_demand(self, previous_iter_impedance, is_last_iteration, estim
144144
saved_pnr_impedance[purpose.name] = purpose_impedance
145145
purpose.park_and_ride_model.set_impedance(previous_iter_impedance)
146146
purpose.calc_prob(purpose_impedance)
147-
if is_last_iteration and purpose.name not in ("sop", "so", "hh"):
147+
if is_last_iteration and purpose.name not in ("sop", "hh"):
148148
purpose.accessibility_model.calc_accessibility(
149149
purpose_impedance)
150150

Scripts/parameters/impedance_transformation.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -176,28 +176,6 @@
176176
"iht": (1, 0),
177177
},
178178
},
179-
"so": {
180-
"car": {
181-
"aht": (0.462121, 0.024173),
182-
"pt": (0.390587, 0.536630),
183-
"iht": (0.147292, 0.439198),
184-
},
185-
"transit": {
186-
"aht": (0.462121, 0.024173),
187-
"pt": (0.390587, 0.536630),
188-
"iht": (0.147292, 0.439198),
189-
},
190-
"bike": {
191-
"aht": (0, 0),
192-
"pt": (1, 1),
193-
"iht": (0, 0),
194-
},
195-
"walk": {
196-
"aht": (0, 0),
197-
"pt": (1, 1),
198-
"iht": (0, 0),
199-
},
200-
},
201179
"wo": {
202180
"car": {
203181
"aht": (0.060857, 0.131316),

0 commit comments

Comments
 (0)