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

Location and mode choice logsums #298

Merged
merged 21 commits into from
Feb 27, 2020
Merged

Location and mode choice logsums #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e48aa39
Merge pull request #1 from ActivitySim/master
bstabler Oct 31, 2019
5097ce8
Merge pull request #2 from ActivitySim/master
bstabler Oct 31, 2019
aa5caad
add h5_store option to write_tables
Dec 20, 2019
6ef2912
optional logsums for location_choice and tour destination models
toliwaga Dec 20, 2019
7e22097
keep csv files as the default
bstabler Dec 28, 2019
a57a3cf
Merge pull request #6 from ActivitySim/develop
bstabler Dec 28, 2019
9cbd0eb
Merge pull request #5 from RSGInc/hdf_out
bstabler Dec 28, 2019
925533d
read input tables from CSV
Dec 30, 2019
f48a530
update docs, drop scripts no longer needed, include example files in …
bstabler Dec 31, 2019
d87b081
formatting
bstabler Dec 31, 2019
6336839
Merge pull request #4 from RSGInc/task_4
bstabler Dec 31, 2019
e78f907
mode choice logsums for trous and trips
toliwaga Jan 8, 2020
1f93570
trip DEST_CHOICE_SAMPLE_TABLE_NAME
toliwaga Jan 20, 2020
67e207d
DEST_CHOICE_SAMPLE_TABLE_NAME cleanup
toliwaga Jan 23, 2020
4ad15c0
update docs for writing logsums and also a couple small development p…
bstabler Feb 14, 2020
7b82cd0
Merge branch 'develop' of https://github.com/ActivitySim/activitysim …
bstabler Feb 27, 2020
abd300d
Merge pull request #9 from RSGInc/ActivitySim-develop
bstabler Feb 27, 2020
275c204
fix small py2 py 3 compatibility issue
bstabler Feb 27, 2020
75c74e0
Merge pull request #11 from RSGInc/py2py3compat
bstabler Feb 27, 2020
a0cde40
py2 py3 compatibility
bstabler Feb 27, 2020
d8e387a
Merge pull request #10 from RSGInc/develop
bstabler Feb 27, 2020
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
83 changes: 58 additions & 25 deletions activitysim/abm/models/atwork_subtour_destination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@
def atwork_subtour_destination_sample(
tours,
persons_merged,
model_settings,
skim_dict,
destination_size_terms,
chunk_size, trace_hh_id):
chunk_size, trace_label):

trace_label = 'atwork_subtour_location_sample'
model_settings = config.read_model_settings('atwork_subtour_destination.yaml')
model_spec = simulate.read_model_spec(file_name='atwork_subtour_destination_sample.csv')

# merge persons into tours
Expand All @@ -45,8 +44,8 @@ def atwork_subtour_destination_sample(

constants = config.get_model_constants(model_settings)

sample_size = model_settings["SAMPLE_SIZE"]
alt_dest_col_name = model_settings["ALT_DEST_COL_NAME"]
sample_size = model_settings['SAMPLE_SIZE']
alt_dest_col_name = model_settings['ALT_DEST_COL_NAME']

logger.info("Running atwork_subtour_location_sample with %d tours", len(choosers))

Expand Down Expand Up @@ -81,8 +80,9 @@ def atwork_subtour_destination_sample(
def atwork_subtour_destination_logsums(
persons_merged,
destination_sample,
model_settings,
skim_dict, skim_stack,
chunk_size, trace_hh_id):
chunk_size, trace_hh_id, trace_label):
"""
add logsum column to existing atwork_subtour_destination_sample table

Expand All @@ -105,9 +105,6 @@ def atwork_subtour_destination_logsums(

"""

trace_label = 'atwork_subtour_destination_logsums'

model_settings = config.read_model_settings('atwork_subtour_destination.yaml')
logsum_settings = config.read_model_settings(model_settings['LOGSUM_SETTINGS'])

# FIXME - MEMORY HACK - only include columns actually used in spec
Expand Down Expand Up @@ -143,17 +140,16 @@ def atwork_subtour_destination_simulate(
subtours,
persons_merged,
destination_sample,
want_logsums,
model_settings,
skim_dict,
destination_size_terms,
chunk_size, trace_hh_id):
chunk_size, trace_label):
"""
atwork_subtour_destination model on atwork_subtour_destination_sample
annotated with mode_choice logsum to select a destination from sample alternatives
"""

trace_label = 'atwork_subtour_destination_simulate'

model_settings = config.read_model_settings('atwork_subtour_destination.yaml')
model_spec = simulate.read_model_spec(file_name='atwork_subtour_destination.csv')

# interaction_sample_simulate insists choosers appear in same order as alts
Expand All @@ -167,7 +163,7 @@ def atwork_subtour_destination_simulate(
chooser_columns = model_settings['SIMULATE_CHOOSER_COLUMNS']
choosers = choosers[chooser_columns]

alt_dest_col_name = model_settings["ALT_DEST_COL_NAME"]
alt_dest_col_name = model_settings['ALT_DEST_COL_NAME']
chooser_col_name = 'workplace_taz'

# alternatives are pre-sampled and annotated with logsums and pick_count
Expand Down Expand Up @@ -200,12 +196,18 @@ def atwork_subtour_destination_simulate(
alternatives,
spec=model_spec,
choice_column=alt_dest_col_name,
want_logsums=want_logsums,
skims=skims,
locals_d=locals_d,
chunk_size=chunk_size,
trace_label=trace_label,
trace_choice_name='workplace_location')

if not want_logsums:
# for consistency, always return a dataframe with canonical column name
assert isinstance(choices, pd.Series)
choices = choices.to_frame('choice')

return choices


Expand All @@ -218,6 +220,16 @@ def atwork_subtour_destination(
land_use, size_terms,
chunk_size, trace_hh_id):

trace_label = 'atwork_subtour_destination'
model_settings = config.read_model_settings('atwork_subtour_destination.yaml')

destination_column_name = 'destination'
logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
want_logsums = logsum_column_name is not None

sample_table_name = model_settings.get('DEST_CHOICE_SAMPLE_TABLE_NAME')
want_sample_table = sample_table_name is not None

persons_merged = persons_merged.to_frame()

tours = tours.to_frame()
Expand All @@ -233,34 +245,55 @@ def atwork_subtour_destination(

destination_size_terms = tour_destination_size_terms(land_use, size_terms, 'atwork')

destination_sample = atwork_subtour_destination_sample(
destination_sample_df = atwork_subtour_destination_sample(
subtours,
persons_merged,
model_settings,
skim_dict,
destination_size_terms,
chunk_size, trace_hh_id)
chunk_size,
tracing.extend_trace_label(trace_label, 'sample'))

destination_sample = atwork_subtour_destination_logsums(
destination_sample_df = atwork_subtour_destination_logsums(
persons_merged,
destination_sample,
destination_sample_df,
model_settings,
skim_dict, skim_stack,
chunk_size, trace_hh_id)
chunk_size, trace_hh_id,
tracing.extend_trace_label(trace_label, 'logsums'))

choices = atwork_subtour_destination_simulate(
choices_df = atwork_subtour_destination_simulate(
subtours,
persons_merged,
destination_sample,
destination_sample_df,
want_logsums,
model_settings,
skim_dict,
destination_size_terms,
chunk_size, trace_hh_id)
chunk_size,
tracing.extend_trace_label(trace_label, 'simulate'))

subtours['destination'] = choices
subtours[destination_column_name] = choices_df['choice']
assign_in_place(tours, subtours[[destination_column_name]])

assign_in_place(tours, subtours[['destination']])
if want_logsums:
subtours[logsum_column_name] = choices_df['logsum']
assign_in_place(tours, subtours[[logsum_column_name]])

pipeline.replace_table("tours", tours)

tracing.print_summary('subtour destination', subtours.destination, describe=True)
if want_sample_table:
# FIXME - sample_table
assert len(destination_sample_df.index.unique()) == len(choices_df)
destination_sample_df.set_index(model_settings['ALT_DEST_COL_NAME'],
append=True, inplace=True)

print(destination_sample_df)
pipeline.extend_table(sample_table_name, destination_sample_df)

tracing.print_summary(destination_column_name,
subtours[destination_column_name],
describe=True)

if trace_hh_id:
tracing.trace_df(tours,
Expand Down
11 changes: 8 additions & 3 deletions activitysim/abm/models/atwork_subtour_mode_choice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ def atwork_subtour_mode_choice(

model_settings = config.read_model_settings('tour_mode_choice.yaml')

logsum_column_name = model_settings.get('MODE_CHOICE_LOGSUM_COLUMN_NAME')
mode_column_name = 'tour_mode' # FIXME - should be passed in?

spec = tour_mode_choice_spec(model_settings)

tours = tours.to_frame()
Expand Down Expand Up @@ -84,21 +87,23 @@ def atwork_subtour_mode_choice(
choices = run_tour_mode_choice_simulate(
subtours_merged,
spec, tour_purpose='atwork', model_settings=model_settings,
mode_column_name=mode_column_name,
logsum_column_name=logsum_column_name,
skims=skims,
constants=constants,
nest_spec=nest_spec,
chunk_size=chunk_size,
trace_label=trace_label,
trace_choice_name='tour_mode_choice')

tracing.print_summary('%s choices' % trace_label, choices, value_counts=True)
tracing.print_summary('%s choices' % trace_label, choices[mode_column_name], value_counts=True)

assign_in_place(tours, choices.to_frame('tour_mode'))
assign_in_place(tours, choices)
pipeline.replace_table("tours", tours)

if trace_hh_id:
tracing.trace_df(tours[tours.tour_category == 'atwork'],
label=tracing.extend_trace_label(trace_label, 'tour_mode'),
label=tracing.extend_trace_label(trace_label, mode_column_name),
slicer='tour_id',
index_label='tour_id')

Expand Down
Loading