Adding fixed-origin to fixed-primary-destination skim wrapper #606
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -924,6 +924,7 @@ def sample_skims(self, presample): | |
|
|
||
| o = self.model_settings["TRIP_ORIGIN"] | ||
| d = self.model_settings["ALT_DEST_COL_NAME"] | ||
| n = self.model_settings.get("PRIMARY_ORIGIN", "origin") | ||
| p = self.model_settings["PRIMARY_DEST"] | ||
|
|
||
| if presample: | ||
|
|
@@ -935,6 +936,8 @@ def sample_skims(self, presample): | |
| skims = { | ||
| "od_skims": skim_dict.wrap(o, d), | ||
| "dp_skims": skim_dict.wrap(d, p), | ||
| "op_skims": skim_dict.wrap(o, p), | ||
| "nd_skims": skim_dict.wrap(n, d), | ||
| "odt_skims": skim_dict.wrap_3d( | ||
| orig_key=o, dest_key=d, dim3_key="trip_period" | ||
| ), | ||
|
|
@@ -947,6 +950,18 @@ def sample_skims(self, presample): | |
| "pdt_skims": skim_dict.wrap_3d( | ||
| orig_key=p, dest_key=d, dim3_key="trip_period" | ||
| ), | ||
| "opt_skims": skim_dict.wrap_3d( | ||
| orig_key=o, dest_key=p, dim3_key="trip_period" | ||
| ), | ||
| "pot_skims": skim_dict.wrap_3d( | ||
| orig_key=p, dest_key=o, dim3_key="trip_period" | ||
| ), | ||
| "ndt_skims": skim_dict.wrap_3d( | ||
| orig_key=n, dest_key=d, dim3_key="trip_period" | ||
| ), | ||
| "dnt_skims": skim_dict.wrap_3d( | ||
| orig_key=d, dest_key=n, dim3_key="trip_period" | ||
| ), | ||
|
There was a problem hiding this comment. This looks probably fine for "legacy" use, but it's going to break the sharrow integration. There's a parallel data structure for sharrow defined here that will need to be updated if this will work with sharrow. There was a problem hiding this comment. Confirmed this breaks the sharrow integration. File "c:\users\wangs1\workspace\activitysim\activitysim\core\interaction_sample_simulate.py", line 161, in _interaction_sample_simulate
) = interaction_simulate.eval_interaction_utilities(
File "c:\users\wangs1\workspace\activitysim\activitysim\core\interaction_simulate.py", line 203, in eval_interaction_utilities
sh_util, sh_flow = apply_flow(
File "c:\users\wangs1\workspace\activitysim\activitysim\core\flow.py", line 774, in apply_flow
flow_result = flow.dot(
File "c:\users\wangs1\workspace\sharrow\sharrow\flows.py", line 1784, in dot
return self._load(
File "c:\users\wangs1\workspace\sharrow\sharrow\flows.py", line 1562, in _load
result = self.iload_raw(source, runner=runner, dtype=dtype, dot=dot)
File "c:\users\wangs1\workspace\sharrow\sharrow\flows.py", line 1476, in iload_raw
raise NameError(problem.group(1)) from err
NameError: name 'op_skims' is not defined |
||
| } | ||
|
|
||
| return skims | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The structure of this change is simple enough, but our lack of a cohesive unit testing regime means there's no "test" that this works without also committing the model configs that it is supposed to go with. We'll need to discuss whether we can make changes like this without proper testing.