Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BayDAG Contribution #8: Landuse and Reindex available in location choice #774

Merged
merged 3 commits into from
Mar 19, 2024
Merged

BayDAG Contribution #8: Landuse and Reindex available in location choice #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0630659
landuse and reindex in loc choice
dhensle Dec 16, 2023
4201d36
landuse available in trip destination
dhensle Dec 16, 2023
48be6f4
replace orca inject with state object
dhensle Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions activitysim/abm/models/location_choice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
)
from activitysim.core.interaction_sample import interaction_sample
from activitysim.core.interaction_sample_simulate import interaction_sample_simulate
from activitysim.core.util import reindex

# import multiprocessing

Expand Down Expand Up @@ -157,6 +158,8 @@ def _location_sample(
"orig_col_name": skims.orig_key, # added for sharrow flows
"dest_col_name": skims.dest_key, # added for sharrow flows
"timeframe": "timeless",
"reindex": reindex,
"land_use": state.get_dataframe("land_use"),
}
locals_d.update(model_settings.CONSTANTS or {})

Expand Down Expand Up @@ -620,6 +623,8 @@ def run_location_simulate(
"orig_col_name": skims.orig_key, # added for sharrow flows
"dest_col_name": skims.dest_key, # added for sharrow flows
"timeframe": "timeless",
"reindex": reindex,
"land_use": state.get_dataframe("land_use"),
}
locals_d.update(model_settings.CONSTANTS or {})

Expand Down
2 changes: 2 additions & 0 deletions activitysim/abm/models/trip_destination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ def _destination_sample(
"size_terms": size_term_matrix,
"size_terms_array": size_term_matrix.df.to_numpy(),
"timeframe": "trip",
"land_use": state.get_dataframe("land_use"),
}
)
locals_dict.update(skims)
Expand Down Expand Up @@ -925,6 +926,7 @@ def trip_destination_simulate(
"size_terms": size_term_matrix,
"size_terms_array": size_term_matrix.df.to_numpy(),
"timeframe": "trip",
"land_use": state.get_dataframe("land_use"),
}
)
locals_dict.update(skims)
Expand Down
Loading