Trip mode choice#55

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 12 commits into from
Apr 8, 2016
Merged

Trip mode choice #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6b1e425
reformatting trip mode choice spec into standard csv
fscottfoti May 11, 2015
8703507
adding the basic structure of the trip mode choice model
fscottfoti May 11, 2015
2fb1cf5
got through about half of the spec
fscottfoti May 13, 2015
1cd4ab1
spec is fairly complete for trip mode choice
fscottfoti May 14, 2015
d36fb95
name of the model was incorrect in the test
fscottfoti May 15, 2015
ff0c8e0
Make reference empty DFs match the test dtypes
jiffyclub May 15, 2015
a238459
name the indexes
fscottfoti May 18, 2015
eb635c1
Resolve conflicts in trip-mode-choice
bstabler Apr 7, 2016
0a3925d
correct conflict resolution
bstabler Apr 7, 2016
0fc36ff
merge in master
bstabler Apr 8, 2016
532d986
removed trailing whitespace
bstabler Apr 8, 2016
5d8bedb
revisions from trip-mode-choice before master merge
bstabler Apr 8, 2016
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
86 changes: 71 additions & 15 deletions activitysim/defaults/models/mode.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"tour_mode_choice.yaml")) as f:
return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"tour_mode_choice.csv")) as f:
return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"tour_mode_choice_coeffs.csv")) as f:
return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
mode_choice_settings):
return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
tour_mode_choice_coeffs,
tour_mode_choice_settings):
return _mode_choice_spec(tour_mode_choice_spec_df,
tour_mode_choice_coeffs,
tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"trip_mode_choice.yaml")) as f:
return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"trip_mode_choice.csv")) as f:
return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
with open(os.path.join(configs_dir,
"configs",
"trip_mode_choice_coeffs.csv")) as f:
return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
trip_mode_choice_coeffs,
trip_mode_choice_settings):
return _mode_choice_spec(trip_mode_choice_spec_df,
trip_mode_choice_coeffs,
trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
tour_mode_choice_spec,
tour_mode_choice_settings,
skims, omx_file):

tours = tours_merged.to_frame()

print mode_choice_spec.eatout

# FIXME this only runs eatout
choices = _mode_choice_simulate(
tours[tours.tour_type == "eatout"],
skims,
get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
omx=omx_file)

print "Choices:\n", choices.value_counts()
orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
trip_mode_choice_spec,
trip_mode_choice_settings,
skims, omx_file):

# FIXME running the trips model on tours
trips = tours_merged.to_frame()

print trip_mode_choice_spec.eatout

# FIXME this only runs eatout
choices = _mode_choice_simulate(
trips[trips.tour_type == "eatout"],
skims,
get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
trip_mode_choice_settings['CONSTANTS'],
omx=omx_file)

print "Choices:\n", choices.value_counts()
orca.add_column("trips", "mode", choices)
6 changes: 6 additions & 0 deletions activitysim/defaults/tables/tours.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
# FIXME
return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
# FIXME
Expand Down
8 changes: 4 additions & 4 deletions activitysim/defaults/test/test_defaults.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
# this is a regression test so that we know if these numbers change
auto_choice = orca.get_table('households').get_column('auto_ownership')
print auto_choice[[2306822, 652072, 651907]]
print pd.Series(
[2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

pdt.assert_series_equal(
auto_choice[[2306822, 652072, 651907]],
pd.Series(
[2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

[2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
orca.run(["cdap_simulate"])

orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
pd.Series(
['school1', 'work1', 'school2'],
index=pd.Index([146642, 642922, 642921], name='PERID')))

orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
orca.run(["destination_choice"])
orca.run(["mandatory_scheduling"])
orca.run(["non_mandatory_scheduling"])
orca.run(["mode_choice_simulate"])
orca.run(["tour_mode_choice_simulate"])

orca.clear_cache()
tmp.close()
Expand Down
3 changes: 2 additions & 1 deletion activitysim/tests/test_skim.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
pd.Series(
[12, 93, 47],
index=[0, 1, 2]
)
),
check_dtype=False
)
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
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
Trip mode choice#55

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 12 commits into

from

Apr 8, 2016
 Merged


Trip mode choice
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
6b1e425

reformatting trip mode choice spec into standard csv


fscottfoti May 11, 2015
8703507

adding the basic structure of the trip mode choice model


fscottfoti May 11, 2015
2fb1cf5

got through about half of the spec


fscottfoti May 13, 2015
1cd4ab1

spec is fairly complete for trip mode choice


fscottfoti May 14, 2015
d36fb95

name of the model was incorrect in the test


fscottfoti May 15, 2015
ff0c8e0

Make reference empty DFs match the test dtypes


jiffyclub May 15, 2015
a238459

name the indexes


fscottfoti May 18, 2015
eb635c1

Resolve conflicts in trip-mode-choice


bstabler Apr 7, 2016
0a3925d

correct conflict resolution


bstabler Apr 7, 2016
0fc36ff

merge in master


bstabler Apr 8, 2016
532d986

removed trailing whitespace


bstabler Apr 8, 2016
5d8bedb

revisions from trip-mode-choice before master merge


bstabler Apr 8, 2016

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


86 changes: 71 additions & 15 deletions
activitysim/defaults/models/mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,34 +16,69 @@


@orca.injectable()
def mode_choice_settings(configs_dir):
def tour_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def mode_choice_spec_df(configs_dir):
def tour_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def mode_choice_coeffs(configs_dir):
def tour_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "tour_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings):
 return _mode_choice_spec(mode_choice_spec_df, mode_choice_coeffs,
 mode_choice_settings)
def tour_mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings):
 return _mode_choice_spec(tour_mode_choice_spec_df,
 tour_mode_choice_coeffs,
 tour_mode_choice_settings)


@orca.injectable()
def trip_mode_choice_settings(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.yaml")) as f:
 return yaml.load(f)


@orca.injectable()
def trip_mode_choice_spec_df(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice.csv")) as f:
 return asim.read_model_spec(f)


@orca.injectable()
def trip_mode_choice_coeffs(configs_dir):
 with open(os.path.join(configs_dir,
 "configs",
 "trip_mode_choice_coeffs.csv")) as f:
 return pd.read_csv(f, index_col='Expression')


@orca.injectable()
def trip_mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings):
 return _mode_choice_spec(trip_mode_choice_spec_df,
 trip_mode_choice_coeffs,
 trip_mode_choice_settings)


def _mode_choice_simulate(tours, skims, spec, additional_constants, omx=None):
Expand DownExpand Up@@ -100,22 +135,43 @@ def get_segment_and_unstack(spec, segment):


@orca.step()
def mode_choice_simulate(tours_merged,
mode_choice_spec,
mode_choice_settings,
 skims, omx_file):
def tour_mode_choice_simulate(tours_merged,
 tour_mode_choice_spec,
 tour_mode_choice_settings,
skims, omx_file):

 tours = tours_merged.to_frame()

 print mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 tours[tours.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(mode_choice_spec, 'eatout'),
mode_choice_settings['CONSTANTS'],
 get_segment_and_unstack(tour_mode_choice_spec, 'eatout'),
tour_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("tours", "mode", choices)


@orca.step()
def trip_mode_choice_simulate(tours_merged,
 trip_mode_choice_spec,
 trip_mode_choice_settings,
 skims, omx_file):

 # FIXME running the trips model on tours
 trips = tours_merged.to_frame()

 print trip_mode_choice_spec.eatout

 # FIXME this only runs eatout
 choices = _mode_choice_simulate(
 trips[trips.tour_type == "eatout"],
 skims,
 get_segment_and_unstack(trip_mode_choice_spec, 'eatout'),
 trip_mode_choice_settings['CONSTANTS'],
 omx=omx_file)

 print "Choices:\n", choices.value_counts()
 orca.add_column("trips", "mode", choices)

6 changes: 6 additions & 0 deletions
activitysim/defaults/tables/tours.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,12 @@ def is_joint(tours):
 return pd.Series(False, index=tours.index)


@orca.column("tours")
def is_not_joint(tours):
 # FIXME
 return pd.Series(True, index=tours.index)


@orca.column("tours")
def number_of_participants(tours):
 # FIXME
Expand Down

8 changes: 4 additions & 4 deletions
activitysim/defaults/test/test_defaults.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,12 +81,13 @@ def test_mini_run(store, random_seed):
 # this is a regression test so that we know if these numbers change
 auto_choice = orca.get_table('households').get_column('auto_ownership')
 print auto_choice[[2306822, 652072, 651907]]
 print pd.Series(
 [2, 1, 1], index=[2306822, 652072, 651907], name="HHID")

 pdt.assert_series_equal(
 auto_choice[[2306822, 652072, 651907]],
 pd.Series(
 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name='HHID')))

 [2, 1, 1], index=pd.Index([2306822, 652072, 651907], name="HHID")))
 orca.run(["cdap_simulate"])

 orca.run(['mandatory_tour_frequency'])
Expand All@@ -99,7 +100,6 @@ def test_mini_run(store, random_seed):
 pd.Series(
 ['school1', 'work1', 'school2'],
 index=pd.Index([146642, 642922, 642921], name='PERID')))

 orca.clear_cache()


Expand DownExpand Up@@ -138,7 +138,7 @@ def test_full_run(store):
 orca.run(["destination_choice"])
 orca.run(["mandatory_scheduling"])
 orca.run(["non_mandatory_scheduling"])
 orca.run(["mode_choice_simulate"])
 orca.run(["tour_mode_choice_simulate"])

 orca.clear_cache()
 tmp.close()
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/tests/test_skim.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,5 +110,6 @@ def test_3dskims(data):
 pd.Series(
 [12, 93, 47],
 index=[0, 1, 2]
 )
 ),
 check_dtype=False
 )
Loading