Location and mode choice logsums#298

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

Merged
bstabler 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Location and mode choice logsums#298

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

 Merged

bstabler
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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