Develop2 - #393

Merged
bstabler merged 186 commits into
developfrom
develop2
Mar 16, 2021
Merged

Develop2#393
bstabler merged 186 commits into
developfrom
develop2

Conversation

@bstabler

@bstablerbstabler commented Mar 15, 2021

Copy link
Copy Markdown
Contributor

No description provided.

bstablerand others added 30 commits October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler merged commit c552ea3 into developMar 16, 2021
@bstabler
bstabler deleted the develop2 branch March 16, 2021 00:44
@coveralls

coveralls commented Mar 16, 2021

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--
, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--

, '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
Develop2 - #393
Merged
bstabler merged 186 commits into
developfrom 
develop2
Mar 16, 2021
Merged
Develop2#393
bstabler merged 186 commits into
developfrom 
develop2
Conversation
@bstabler
@bstablerbstabler
commented
Mar 15, 2021

Copy link


Copy Markdown

Contributor
 No description provided. 
bstablerand others
added 30 commits
October 31, 2019 11:21
@bstabler
Merge pull request#1from ActivitySim/master
e48aa39
pull latest updates
@bstabler
Merge pull request#2from ActivitySim/master
5097ce8
pull some prettier expression file formatting updates
@toliwaga
estimation through atwork_subtour_mode_choice
2e50281
@toliwaga
wayward print statement
2298dd6
@toliwaga
estimation does not drop zero_rows from evaled spec
3299222
@toliwaga
pycodestyle
5d844d6
@bstablerBlake
@jpn--@toliwaga
Tnc updates and notebooks (#18)
981627e
* move other resources into folder since examples now part of package as well
* Add new skim lookups for the TNC bridge tolls return charges below.
- odr - origin to destination reverse
- dor - destination to origin reverse
TNC revisions:
- Update TNC bridge tolls so return charges are included
- Added ride-hail single and taxi constants for trip mode choice within ride-hail tour mode choice
- Reduced TNC wait time mean and sd slightly to in the highest density category
- Turned on origin density index constant (already used for walk, bike and walk-transit modes) for TNC single and TNC shared
* allow for a small number of stop locations within walking distance
* updated tnc ascs from tm 1.5 run
* add notebooks
* add readme for notebooks folder
* Interactive tutorial (#3)
* Add verification jupyter notebook
* add shapefile
* code review
* cleanup
* update shapefile note
Co-authored-by: Ben Stabler <bstabler@users.noreply.github.com>
Co-authored-by: bstabler <benstabler@yahoo.com>
* clean up folder setup
* finish summaries notebook
* updated getting started tutorial
* continue work on the recipe book
* estimation notebooks for larch (#19)
* notebooks for auto ownership and workplace location estimation
* minimally functional larch estimation mode notebooks
includes auto ownership, workplace location, tour mode
requires larch >= 5.3.7
* revised notebooks
uses new EDB for tour_mode_choice
* update example EDBs and estimation notebooks
* Fix tour mode choice notebook (#20)
Fill in missing values in values DataFrame
* update notebook
* update getting started notebook
* more notebook updates
* notebook for estimating school location (#21)
* create two and three zone test data, see also https://github.com/ActivitySim/activitysim/wiki/Multiple-Zone-Systems-Design
* update notebook markdown
* after merge from develop, resolve conflicts, pycodestyle, and add header to school location notebook
* small doc fix
* update tests EXPECT_TOUR_COUNT
* resolve conflict
Co-authored-by: Blake <blake.rosenthal@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@newman.me>
Co-authored-by: Jeff Doyle <toliwaga@gmail.com>
@toliwaga
move estimatin notebooks to example folder
aca4e6b
@toliwaga
change import column drop list to keep list
b14e36e
@bstabler
Some doc updates, including dropping parking location choice since it…
553215b
… has yet to be implemented and adding a draft estimation functionality flow chart
@bstabler
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
29cacac
…develop
@bstabler
update estimation flow chart
d2faf1f
@toliwaga
improved tracing of expression_values in eval_utilities
5687f47
@toliwaga
Merge branch 'develop' ofhttps://github.com/RSGInc/activitysiminto …
3728707
…develop
@toliwaga
want_dest_choice_sample_tables setting
1035cd8
@toliwaga
no more stagger
c53cc77
@toliwaga
no more stagger
b05db7a
@toliwaga
low level mp logging
535566d
@toliwaga
multiprocessing related logging and error checking
957eb85
@toliwaga
TEST_SPAWN flag to short circuit skim loading for faster mp spawn tes…
5f5817f
…ting
@toliwaga
trip_destination handle all trips fail
967a843
@toliwaga
skim caching with numpy memmap to speed skim loading
f4576c5
@toliwaga
better chunking in vectorize_tour_scheduling
a909446
@toliwaga
estimation build script and a minot mode choice expression fix
09fd741
@toliwaga
fix bug in tour mod echoice expression util_DRIVE_LRF_number_of_trans…
32c96b7
…fers
@toliwaga
estimation data folders and skim fixes
d35f496
@bstabler
add template output folder
f85d451
@toliwaga
generalized skim loading and working legacy (other resources) example…
f2f004e
…_multiple_zone
@toliwaga
skims setting to support multi-zone
29d841b
@bstabler
update estimation notebooks to run examples
dcef79f
@toliwaga
test_psrc, skim file name globs
315c06a
@toliwaga
rename configs_na configs_skip_accessibility
6b5d38d
@toliwaga
psrc change_log - add nots on maz_to_maz files copied from mtc example
113d29b
@toliwaga
psrc configs_accessibility
a6e82f7
@toliwaga
add configs_accessibility to example_manifest for prsc seattle and full
fba48a8
@toliwaga
chunking support for accessibilities step
6d1ce53
@toliwaga
example semcog arc psrc marin with travis tests
bdd37e1
timetable.max_time_block_available
@toliwaga
example_marin data dir
b34df82
@toliwaga
wxample data skim cleanup and ensmallment
41da43e
@toliwaga
update travis with new path to two_zone_example_data.py and three_zon…
a9f9971
…e_example_data.py
@toliwaga
fix bug in MazSkimDict when omx file has no offset map
a45a93c
@toliwaga
destination_presample tracing
4e10823
@toliwaga
remove segment_preprocessor directive from school_location.yaml since…
4c19051
… now handled in annotate_persons
@toliwaga
cleanup_pipeline_after_run and example_mtc/test
68cecc8
@toliwaga
tour scheduling representative logsums
c7de057
@toliwaga
semcog congigs cleanyp
af994c8
@toliwaga
mandatory_tour_frequency representative logsums merged and passing
b897fa5
@toliwaga
restore mandatory_scheduling estimation bundle
a70c0cd
@toliwaga
example_multiple_zone tests and travis tweaks
ca8a15c
@toliwaga
all tests strict ignore deprecation warning for np.object
5446b76
@toliwaga
pycodestyle
edc8d0c
@toliwaga
segregate abm test_misc and test_pipeline
84c92ee
@toliwaga
disable example_multizone test call to build_data because path irks t…
7520e85
…ravis
@toliwaga
pycodestyle again sigh
c54c849
@toliwaga
filterwarnings for np.object needed leading backtick
e082c3a
@toliwaga
add EXAMPLE_HAS_WARNINGS to flag non-strict example tests
c1e8f48
@toliwaga
tour_destination_size_terms sorts land_use instead of requiring input…
3426445
… table to ahve been sorted
@bstabler
bstabler
merged commit c552ea3
into
developMar 16, 2021
@bstabler
bstabler
deleted the

develop2

branch
March 16, 2021 00:44
@coveralls
coveralls
commented
Mar 16, 2021

Copy link


Copy Markdown

Coverage Status
Coverage decreased (-7.2%) to 70.393% when pulling 3426445 on develop2 into f5709f1 on develop.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@bstabler@coveralls@toliwaga@albabnoor@jpn--