Uh oh!
There was an error while loading. Please reload this page.
Conversation
Instead of having a dual-purpose __getitem__, only have it return matrices by name. To get matrices matching a key/value attribute pair use the method get_matrices_by_attr.
toliwaga added a commit
that referenced
this pull request
Sep 26, 2017
jpn-- added a commit
that referenced
this pull request
Mar 21, 2023
* code changes to add joint tour utilities in cdap * add joint tour frequency composition component * post process jtfc result to tours * update joint tour participation * update #inmtf to tm2 specs * allow alternative id > 127 * set up testing infrastructure * cdap test script * cdap configs * set up testing infrastructure * joint tour test script * joint tour configs * set up testing infrastructure * nm tour frequency test script * nm tour frequency configs * add jtfc alt table dictionary to yaml * update jtfc yaml * jtfc move coef values to coef.csv * jtfc update preprocessor * add jtfc alt table dictionary to yaml * nmtf consolidate all -999 to one coef * code changes to fix bug in parking location choice model * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * move coefficients to csv file * restore the original mandatory channels * restore the original mandatory channels * RSG Phase 7 Development (#49) * school escorting initial commit * bundles created * added pure escort tours after non_mand_sched * created escorting tours & trips * integrated escort tours and trips * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * downstream model integration * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * initial commit of flexible tour/trip ids * pycodestyle * black formatting * Bump version: 1.0.4 → 1.1.0 * adding frequency alternatives configs required for test system * added additional unit tests * added setup function for test configs dir * formatting * handling missing alts files in examples * error catching around extension probs * passing tests * still passing tests around missing config files * accounting for missing mtf spec in marin example * nm tour scheduling passing * updating stop freq in tours table * added check for mand tour overlap with pe tours * num chauffeurs and escortees * fixed defaults not getting used if file missing * merging canonical ids from flexible id work * setting escorting tour and trip ids * remove unneeded nmtf settings file * black formatting * excluding escort trips from trip scheduling * fixing bug where mand tours not getting assigned correct id * adding school_escorting to mp model list * Added mwcog small area * missed one edit * adding school escort tour flavors as own category * reformatting * updating timetable windows with pure escort tours * additional logging * Update README.MD * call as module * github actions tests * adding non-mand destination changes * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * fixing bad tdd merge * repair test multiple zones for github actions * publish develop docs * fix docbuild env * merging tdd alts to all tours * adding ride share threshold to unvailability for pure escort time overlap * cleanup * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * mins per time bin * black formatting * black formatting * fixing reindex import bug * fixing missed import * replacing trips test table * inserting default setting if no models in config for tests * publish docs to branch name * adding setup function to tests to set configs_dir injectable * documentation * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * fixed origin bug and missing outbound trip to work * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * proper cleanup when trips that get removed if schedule failed * changed failed trip scheduling option for example * updating regress table * blacken * extending nmtf and stop frequency to demonstrate flexible ids * param on rtol * fix sandag_2 test files * fix test file names * allowing multiple escort tours in the same period * sandag 3-zone example fix * fixing expression for missing escort participants sandag 3_zone * cleanup * blacken * Update trip_destination.py applying valid primary origin default value * Update trip_destination.py blacken * fixing bug for inbound destination for second escortee * blacken * Disaggregate Accessibilities (#5) * initial commit with basic working proto pop gen * fixed bad dependency range * fixed vary_on method to vary all with mapped fields after * added check if already dataframe * added dataframe check if the table passed is already a dataframe * working proto pop gen. still debugging mandatory work/school model * check all table is df * workplace runs, next testing school * began setting up to get all logsums, not just chosen ones * restructured to run as either one-off or model step * revert to last merge. Removed dataframe check in iterate, no longer needed to modify this file * extracted logsums, need to inject into pipeline or save output? * working standalone or step model * extractable accessibilities for fixed and nonmandatory * extractable accessibilities for fixed and nonmandatory * cleanup and add documentation * resolved duplicates of old 'example' folders * model uses write_tables functionality * disaggregate accessibility runs as model step or standalone. Runs as subprocess * working model test. table initialization not yet working * added logsum short circuit to get logsums and avoid drawing unneccesary samples * working model plus major cleanup * working model plus major cleanup * override sample size * fixed trace output files * skip_choice default to False * fixed empty logsums bug * cleanup redundent parameters * fixed list index instead of set * coordinated model run files * added default skip to false * added multiprocessing line * began setup for multiprocessing * fixed sampling problem. Pipeline for multi processing, NOT WORKING YET * deleted run file, not needed anymore * update release instructions * auto-build docs on release * remind to update switcher * need checkout * added helper functions for handling suffix args * to enable multiprocessing, overhauled pipeline method to include proto_ tables rather than overwriting main tables * working multiprocess, but requires debugging. fails on other models * working multiprocess, but requires debugging. fails on other models * cleanup of mp table registering * fixed tracing and slicing issue * removed old 'run' model * setup example 2 zones * minimum working 2 zone * multizone basic working * fixed buggy settings * multiprocessing working, but empty final tables * fixed blank output bug and cleaned up settings to use verbose table names (not just 'disaggregate_accessibility') * cleanup run scripts a bit * fixed missing base path for full run * fixed missing path * fixed typo * fixed 1 per taz sampling * fixing person merge bug and filtering workers * fixed duplicate tours! * updated settings for initialize disagg * removed obsolete file * cleaned up file and moved initialize to tables/... * added find nearest node function * added initialize disaggregate_accessibility to initialize_households * moved initialize steps to 'tables/disaggregate_accessibility' * updated settings to include initialize disaggregate accessibilities as part of initialize_households * moved initialize disagg accessibilities to tables. Created working merge step using naive bayes and 'hard' join * add mp back in * PEP formatting revisions * fixed logsums merge on households instead of persons * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * fixed missing column pipeline error * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * updated dependencies * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * update sampling script * 'blacken' * fixed replacement sample bug * updated documentation * more flexible scenario testing * blacken Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> * Shadow Pricing Enhancements (#7) * updated scripts to include simulation-based shadow pricing * blacken * Updated shadow_pricing.yaml for mtc example * code cleanup * more cleanup * documentation and passing tests * passing tests * passing tests * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * fixing pandas future warning * blacken * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * always updating choices * testing removal of lognormal for hh vot * putting hh vot back in * updating to match sharrow test versions * raw person table for buffer instead of injectable * adding segmentation, output by iteration, and external worker removal * formatting & documentation Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * updating mtc_extended test files * no sp for non-work or school, better logging, weighting options * sample TAZ only if available MAZ when shadow pricing * adding missed weight column option * cleaning up comments Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * set up testing infrastructure (#40) Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * BayDAG auto ownership configs and test (#41) * set up testing infrastructure * auto ownership test script * auto ownership configs * ao move coef values to coef.csv Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * more formatting * blacken * blacken * blacken * BayDAG parking location choice configs and test (#45) * code changes to fix bug in parking location choice model * parking location choice configs * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * parking location choice config updates move coefficients to csv file and activitysim variable naming consistency * parking location choice summary Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * cdap bug fixes * adding sklearn to dependencies * Update activitysim-dev.yml fixing bad reference to scikit-learn * Update activitysim-test.yml fixing bad reference to scikit-learn * Update setup.cfg fixing bad reference to scikit-learn * Memory Bug Fix * working with 2k no sp * optimize nearest zone determination * Changed data type of participant_id in candidates in joint_tour_participation_candidates() to unsigned 64-bit integer to prevent overflow * better comments * fix overflow in jtp participant id * blacken * forcing participation * Trip Scheduling (#51) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * Trip Scheduling Bug & Trip Mode Choice Annotate (#55) * other sp methods price updates * Trip Scheduling into Resident Debug (#54) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding annotate to trip mode choice * no earliest change if previous trip fail Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding locals_dict to annotate * chooser cols in final trips table * BayDAG merge with ActivitySim v1.2 (#56) * fixed logsums merge on households instead of persons * code cleanup * more cleanup * documentation and passing tests * passing tests * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * passing tests * ext cli arg * memory sidecar * restart if resume_after checkpoint is missing * no pandas 1.5 yet * stop the sidecar * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * minor repairs * skip when household_income is None * fixed missing column pipeline error * fixing pandas future warning * blacken * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * updated dependencies * always updating choices * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * testing removal of lognormal for hh vot * putting hh vot back in * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * updating to match sharrow test versions * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * raw person table for buffer instead of injectable * add mp test for prototype_mtc_extended * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * Update random.py * Updated test environment to reflect changes in pandas * Removed random random seed generation from placeholder_sandage 1-zone test configuration to get example to pass automated test * update sampling script * 'blacken' * fixed replacement sample bug * adding segmentation, output by iteration, and external worker removal * updated documentation * more flexible scenario testing * blacken * Added test_random_seed.py * blacken test_random_seed.py * Moved random seed generation testing out of prototype_mtc folder and edited core_tests.yaml to call it * Corrected name of check_outputs() * Added print statements to debug script * Blacken test_random_seed.py * keep alternative attributes in parking location * move coeff values to coeff csv * Added pipe character to call that tests the random generator * Added explicit call for pytest to run test_random_seed.py * Added print statement at start of script for debugging * Replaced single quotes with double quotes in print statement * reformat with Black * Moved random seed test into activitysim folder * Edited core_tests.yml to reflect change in location of random seed test * Renamed tests folder to test to reflect call in core-tests.yml * formatting & documentation * Added test_random_seed function for PyTest to read * Fixed defition of seeds list and removed print statements * updating github test env * responding to review comments * Added line to create output folder as that's not being committed * create_rng_configs() now copies entire example configs directory instead of just settings.yaml * Added try except statement when creating the output directory in case it already exists * additional logging, random seed option, landuse sample weight column * ensuring TAZ is not selected if no available MAZ * adding logic to skip external location choice models * Applied suggested changes * Removed activitysim\test\random_seed\configs directory to reduce confusion * Moved random seed test directory to folder that had already existed * temporarily constrain pandas #608 * work around psutil runtimeerror * temp constrain pandas * add mwcog full example * review responses * revisions per Sijia's comments, except for the proto-table-template implementation, still working. * added template pop option * blacken * set back to create_tables to pass test against old tables * updated proto-pop test data * resolved bad test data issue * warn don't fail on duplicate skims * include sharrow in mwcog example * cleanup * zarr digital encoding for mwcog * include reference in psrc mini * fow window ids to int64 because windows * handle expected warnings * unpin dependencies * columns cannot be a set * unpin pandas * columns cannot be a set * numeric_only args in groupby.sum * docs: correct the unit of `chunk_size`. * change 'arry' to more readable 'sizearray' * repair tests * catch FileNotFound * add check that land use is zero-based when using sharrow * better docs on skims in shared memory * better docstrings for skimdataset * remove old code * remove junk * add logging for recoding * optimize nearest zone determination * consistent multiprocessing results * blacken * updating regression trips * adding sandag 2-zone test * blacken * fix merge error * allow pandas 1.5 again * sharrow compatibility with #606 * remove outdated code in comments * note on tracing limitation * allow repeating key cols * fix decoding in MP output * escortee modes match chauf modes * updating regression tests * fixing bad var name in inbound expressions * add note about `condense_parameters` * change default condense_parameters to False * Update .gitignore Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> * ignore caches * remove special install instructions * remove sharrow_skip's * Revert "remove sharrow_skip's" This reverts commit 6b52af2. * add note about why sharrow_skip is activated * Update school_escorting.yaml * Update config.py * arc trip destination spec skim correction * update regression trips * require sharrow 2.5 * fix mtc_ext for sharrow * fix test consistent with escort mode alignments * allow sharrow skipping * remove stray indent * delete expression values after sharrow testing to make debugging easier * require sharrow 2.5.2 * recode only once * testing repairs * note about why sharrow_skip * fork mtc_extended testing on shadow pricing and sharrow * note on sharrow_skip * size term scaling only for full run * reordering * multiprocessing hangs! * never scale size terms for disagg * tally pending persons * tests cleanup * fix error with orca * let pipeline tables be dropped * check on available MAZs, comment cleanup * work zone to -1 if wfh, removed unneeded extensions * fix tests for sandag 2zone * ignore deprecation warning in tests not clear why this started being a problem suddenly in only the xborder-MP model * add scikit-learn to formal dependencies * docs update for installer * fixing black to 22.12.0 * missed merge conflicts * fixing merge issues in prototype_semcog * fixing prototype_arc merge * fixing placeholder_sandag merge issues * blacken * fixing mwcog merge issues * skims not found during estimation test --------- Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeff Newman <jeffnewman@camsys.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: Joe Flood <joejimflood@gmail.com> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * do not require all alts in data file * int8 to int16 lost in v1.2 merge --------- Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
jpn-- added a commit
that referenced
this pull request
Apr 17, 2023
* keep black 2022 style for now * typo in link * note about pre-package installer in quick start * add model_settings to estimator.write_coefficients * BayDAG Contributions (#657) * code changes to add joint tour utilities in cdap * add joint tour frequency composition component * post process jtfc result to tours * update joint tour participation * update #inmtf to tm2 specs * allow alternative id > 127 * set up testing infrastructure * cdap test script * cdap configs * set up testing infrastructure * joint tour test script * joint tour configs * set up testing infrastructure * nm tour frequency test script * nm tour frequency configs * add jtfc alt table dictionary to yaml * update jtfc yaml * jtfc move coef values to coef.csv * jtfc update preprocessor * add jtfc alt table dictionary to yaml * nmtf consolidate all -999 to one coef * code changes to fix bug in parking location choice model * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * move coefficients to csv file * restore the original mandatory channels * restore the original mandatory channels * RSG Phase 7 Development (#49) * school escorting initial commit * bundles created * added pure escort tours after non_mand_sched * created escorting tours & trips * integrated escort tours and trips * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * downstream model integration * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * initial commit of flexible tour/trip ids * pycodestyle * black formatting * Bump version: 1.0.4 → 1.1.0 * adding frequency alternatives configs required for test system * added additional unit tests * added setup function for test configs dir * formatting * handling missing alts files in examples * error catching around extension probs * passing tests * still passing tests around missing config files * accounting for missing mtf spec in marin example * nm tour scheduling passing * updating stop freq in tours table * added check for mand tour overlap with pe tours * num chauffeurs and escortees * fixed defaults not getting used if file missing * merging canonical ids from flexible id work * setting escorting tour and trip ids * remove unneeded nmtf settings file * black formatting * excluding escort trips from trip scheduling * fixing bug where mand tours not getting assigned correct id * adding school_escorting to mp model list * Added mwcog small area * missed one edit * adding school escort tour flavors as own category * reformatting * updating timetable windows with pure escort tours * additional logging * Update README.MD * call as module * github actions tests * adding non-mand destination changes * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * fixing bad tdd merge * repair test multiple zones for github actions * publish develop docs * fix docbuild env * merging tdd alts to all tours * adding ride share threshold to unvailability for pure escort time overlap * cleanup * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * mins per time bin * black formatting * black formatting * fixing reindex import bug * fixing missed import * replacing trips test table * inserting default setting if no models in config for tests * publish docs to branch name * adding setup function to tests to set configs_dir injectable * documentation * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * fixed origin bug and missing outbound trip to work * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * proper cleanup when trips that get removed if schedule failed * changed failed trip scheduling option for example * updating regress table * blacken * extending nmtf and stop frequency to demonstrate flexible ids * param on rtol * fix sandag_2 test files * fix test file names * allowing multiple escort tours in the same period * sandag 3-zone example fix * fixing expression for missing escort participants sandag 3_zone * cleanup * blacken * Update trip_destination.py applying valid primary origin default value * Update trip_destination.py blacken * fixing bug for inbound destination for second escortee * blacken * Disaggregate Accessibilities (#5) * initial commit with basic working proto pop gen * fixed bad dependency range * fixed vary_on method to vary all with mapped fields after * added check if already dataframe * added dataframe check if the table passed is already a dataframe * working proto pop gen. still debugging mandatory work/school model * check all table is df * workplace runs, next testing school * began setting up to get all logsums, not just chosen ones * restructured to run as either one-off or model step * revert to last merge. Removed dataframe check in iterate, no longer needed to modify this file * extracted logsums, need to inject into pipeline or save output? * working standalone or step model * extractable accessibilities for fixed and nonmandatory * extractable accessibilities for fixed and nonmandatory * cleanup and add documentation * resolved duplicates of old 'example' folders * model uses write_tables functionality * disaggregate accessibility runs as model step or standalone. Runs as subprocess * working model test. table initialization not yet working * added logsum short circuit to get logsums and avoid drawing unneccesary samples * working model plus major cleanup * working model plus major cleanup * override sample size * fixed trace output files * skip_choice default to False * fixed empty logsums bug * cleanup redundent parameters * fixed list index instead of set * coordinated model run files * added default skip to false * added multiprocessing line * began setup for multiprocessing * fixed sampling problem. Pipeline for multi processing, NOT WORKING YET * deleted run file, not needed anymore * update release instructions * auto-build docs on release * remind to update switcher * need checkout * added helper functions for handling suffix args * to enable multiprocessing, overhauled pipeline method to include proto_ tables rather than overwriting main tables * working multiprocess, but requires debugging. fails on other models * working multiprocess, but requires debugging. fails on other models * cleanup of mp table registering * fixed tracing and slicing issue * removed old 'run' model * setup example 2 zones * minimum working 2 zone * multizone basic working * fixed buggy settings * multiprocessing working, but empty final tables * fixed blank output bug and cleaned up settings to use verbose table names (not just 'disaggregate_accessibility') * cleanup run scripts a bit * fixed missing base path for full run * fixed missing path * fixed typo * fixed 1 per taz sampling * fixing person merge bug and filtering workers * fixed duplicate tours! * updated settings for initialize disagg * removed obsolete file * cleaned up file and moved initialize to tables/... * added find nearest node function * added initialize disaggregate_accessibility to initialize_households * moved initialize steps to 'tables/disaggregate_accessibility' * updated settings to include initialize disaggregate accessibilities as part of initialize_households * moved initialize disagg accessibilities to tables. Created working merge step using naive bayes and 'hard' join * add mp back in * PEP formatting revisions * fixed logsums merge on households instead of persons * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * fixed missing column pipeline error * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * updated dependencies * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * update sampling script * 'blacken' * fixed replacement sample bug * updated documentation * more flexible scenario testing * blacken Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> * Shadow Pricing Enhancements (#7) * updated scripts to include simulation-based shadow pricing * blacken * Updated shadow_pricing.yaml for mtc example * code cleanup * more cleanup * documentation and passing tests * passing tests * passing tests * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * fixing pandas future warning * blacken * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * always updating choices * testing removal of lognormal for hh vot * putting hh vot back in * updating to match sharrow test versions * raw person table for buffer instead of injectable * adding segmentation, output by iteration, and external worker removal * formatting & documentation Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * updating mtc_extended test files * no sp for non-work or school, better logging, weighting options * sample TAZ only if available MAZ when shadow pricing * adding missed weight column option * cleaning up comments Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * set up testing infrastructure (#40) Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * BayDAG auto ownership configs and test (#41) * set up testing infrastructure * auto ownership test script * auto ownership configs * ao move coef values to coef.csv Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * more formatting * blacken * blacken * blacken * BayDAG parking location choice configs and test (#45) * code changes to fix bug in parking location choice model * parking location choice configs * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * parking location choice config updates move coefficients to csv file and activitysim variable naming consistency * parking location choice summary Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * cdap bug fixes * adding sklearn to dependencies * Update activitysim-dev.yml fixing bad reference to scikit-learn * Update activitysim-test.yml fixing bad reference to scikit-learn * Update setup.cfg fixing bad reference to scikit-learn * Memory Bug Fix * working with 2k no sp * optimize nearest zone determination * Changed data type of participant_id in candidates in joint_tour_participation_candidates() to unsigned 64-bit integer to prevent overflow * better comments * fix overflow in jtp participant id * blacken * forcing participation * Trip Scheduling (#51) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * Trip Scheduling Bug & Trip Mode Choice Annotate (#55) * other sp methods price updates * Trip Scheduling into Resident Debug (#54) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding annotate to trip mode choice * no earliest change if previous trip fail Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding locals_dict to annotate * chooser cols in final trips table * BayDAG merge with ActivitySim v1.2 (#56) * fixed logsums merge on households instead of persons * code cleanup * more cleanup * documentation and passing tests * passing tests * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * passing tests * ext cli arg * memory sidecar * restart if resume_after checkpoint is missing * no pandas 1.5 yet * stop the sidecar * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * minor repairs * skip when household_income is None * fixed missing column pipeline error * fixing pandas future warning * blacken * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * updated dependencies * always updating choices * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * testing removal of lognormal for hh vot * putting hh vot back in * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * updating to match sharrow test versions * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * raw person table for buffer instead of injectable * add mp test for prototype_mtc_extended * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * Update random.py * Updated test environment to reflect changes in pandas * Removed random random seed generation from placeholder_sandage 1-zone test configuration to get example to pass automated test * update sampling script * 'blacken' * fixed replacement sample bug * adding segmentation, output by iteration, and external worker removal * updated documentation * more flexible scenario testing * blacken * Added test_random_seed.py * blacken test_random_seed.py * Moved random seed generation testing out of prototype_mtc folder and edited core_tests.yaml to call it * Corrected name of check_outputs() * Added print statements to debug script * Blacken test_random_seed.py * keep alternative attributes in parking location * move coeff values to coeff csv * Added pipe character to call that tests the random generator * Added explicit call for pytest to run test_random_seed.py * Added print statement at start of script for debugging * Replaced single quotes with double quotes in print statement * reformat with Black * Moved random seed test into activitysim folder * Edited core_tests.yml to reflect change in location of random seed test * Renamed tests folder to test to reflect call in core-tests.yml * formatting & documentation * Added test_random_seed function for PyTest to read * Fixed defition of seeds list and removed print statements * updating github test env * responding to review comments * Added line to create output folder as that's not being committed * create_rng_configs() now copies entire example configs directory instead of just settings.yaml * Added try except statement when creating the output directory in case it already exists * additional logging, random seed option, landuse sample weight column * ensuring TAZ is not selected if no available MAZ * adding logic to skip external location choice models * Applied suggested changes * Removed activitysim\test\random_seed\configs directory to reduce confusion * Moved random seed test directory to folder that had already existed * temporarily constrain pandas #608 * work around psutil runtimeerror * temp constrain pandas * add mwcog full example * review responses * revisions per Sijia's comments, except for the proto-table-template implementation, still working. * added template pop option * blacken * set back to create_tables to pass test against old tables * updated proto-pop test data * resolved bad test data issue * warn don't fail on duplicate skims * include sharrow in mwcog example * cleanup * zarr digital encoding for mwcog * include reference in psrc mini * fow window ids to int64 because windows * handle expected warnings * unpin dependencies * columns cannot be a set * unpin pandas * columns cannot be a set * numeric_only args in groupby.sum * docs: correct the unit of `chunk_size`. * change 'arry' to more readable 'sizearray' * repair tests * catch FileNotFound * add check that land use is zero-based when using sharrow * better docs on skims in shared memory * better docstrings for skimdataset * remove old code * remove junk * add logging for recoding * optimize nearest zone determination * consistent multiprocessing results * blacken * updating regression trips * adding sandag 2-zone test * blacken * fix merge error * allow pandas 1.5 again * sharrow compatibility with #606 * remove outdated code in comments * note on tracing limitation * allow repeating key cols * fix decoding in MP output * escortee modes match chauf modes * updating regression tests * fixing bad var name in inbound expressions * add note about `condense_parameters` * change default condense_parameters to False * Update .gitignore Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> * ignore caches * remove special install instructions * remove sharrow_skip's * Revert "remove sharrow_skip's" This reverts commit 6b52af2. * add note about why sharrow_skip is activated * Update school_escorting.yaml * Update config.py * arc trip destination spec skim correction * update regression trips * require sharrow 2.5 * fix mtc_ext for sharrow * fix test consistent with escort mode alignments * allow sharrow skipping * remove stray indent * delete expression values after sharrow testing to make debugging easier * require sharrow 2.5.2 * recode only once * testing repairs * note about why sharrow_skip * fork mtc_extended testing on shadow pricing and sharrow * note on sharrow_skip * size term scaling only for full run * reordering * multiprocessing hangs! * never scale size terms for disagg * tally pending persons * tests cleanup * fix error with orca * let pipeline tables be dropped * check on available MAZs, comment cleanup * work zone to -1 if wfh, removed unneeded extensions * fix tests for sandag 2zone * ignore deprecation warning in tests not clear why this started being a problem suddenly in only the xborder-MP model * add scikit-learn to formal dependencies * docs update for installer * fixing black to 22.12.0 * missed merge conflicts * fixing merge issues in prototype_semcog * fixing prototype_arc merge * fixing placeholder_sandag merge issues * blacken * fixing mwcog merge issues * skims not found during estimation test --------- Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeff Newman <jeffnewman@camsys.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: Joe Flood <joejimflood@gmail.com> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * do not require all alts in data file * int8 to int16 lost in v1.2 merge --------- Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * docs: apply a minor correction to user guides (#659) * Trip scheduling logic (#660) * trip scheduling logic_version * in testing ignore the warning we just added * cannot use logic_version 1 with relative scheduling * Pin Dependencies (#665) * pinderella * pandas in setup.cfg deps --------- Co-authored-by: Bo Wen <bo.wen@translink.ca> Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com> Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
jpn-- added a commit
that referenced
this pull request
Jan 31, 2024
* initial commit * Input checker runs, but log file is written incompletely * updated input checker to write out full log file * blacked input_checker.py * data model integration initial commit * initial pandera commit * initial cleanup * tested on full mtc sample with landuse and skim check * lu types in enums & input cleanup * initial commit of both pydantic & pandera * formatting * Getting into sync with ActivitySim/develop (#8) * BayDAG Contributions (#657) * code changes to add joint tour utilities in cdap * add joint tour frequency composition component * post process jtfc result to tours * update joint tour participation * update #inmtf to tm2 specs * allow alternative id > 127 * set up testing infrastructure * cdap test script * cdap configs * set up testing infrastructure * joint tour test script * joint tour configs * set up testing infrastructure * nm tour frequency test script * nm tour frequency configs * add jtfc alt table dictionary to yaml * update jtfc yaml * jtfc move coef values to coef.csv * jtfc update preprocessor * add jtfc alt table dictionary to yaml * nmtf consolidate all -999 to one coef * code changes to fix bug in parking location choice model * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * move coefficients to csv file * restore the original mandatory channels * restore the original mandatory channels * RSG Phase 7 Development (#49) * school escorting initial commit * bundles created * added pure escort tours after non_mand_sched * created escorting tours & trips * integrated escort tours and trips * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * downstream model integration * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * initial commit of flexible tour/trip ids * pycodestyle * black formatting * Bump version: 1.0.4 → 1.1.0 * adding frequency alternatives configs required for test system * added additional unit tests * added setup function for test configs dir * formatting * handling missing alts files in examples * error catching around extension probs * passing tests * still passing tests around missing config files * accounting for missing mtf spec in marin example * nm tour scheduling passing * updating stop freq in tours table * added check for mand tour overlap with pe tours * num chauffeurs and escortees * fixed defaults not getting used if file missing * merging canonical ids from flexible id work * setting escorting tour and trip ids * remove unneeded nmtf settings file * black formatting * excluding escort trips from trip scheduling * fixing bug where mand tours not getting assigned correct id * adding school_escorting to mp model list * Added mwcog small area * missed one edit * adding school escort tour flavors as own category * reformatting * updating timetable windows with pure escort tours * additional logging * Update README.MD * call as module * github actions tests * adding non-mand destination changes * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * fixing bad tdd merge * repair test multiple zones for github actions * publish develop docs * fix docbuild env * merging tdd alts to all tours * adding ride share threshold to unvailability for pure escort time overlap * cleanup * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * mins per time bin * black formatting * black formatting * fixing reindex import bug * fixing missed import * replacing trips test table * inserting default setting if no models in config for tests * publish docs to branch name * adding setup function to tests to set configs_dir injectable * documentation * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * fixed origin bug and missing outbound trip to work * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * proper cleanup when trips that get removed if schedule failed * changed failed trip scheduling option for example * updating regress table * blacken * extending nmtf and stop frequency to demonstrate flexible ids * param on rtol * fix sandag_2 test files * fix test file names * allowing multiple escort tours in the same period * sandag 3-zone example fix * fixing expression for missing escort participants sandag 3_zone * cleanup * blacken * Update trip_destination.py applying valid primary origin default value * Update trip_destination.py blacken * fixing bug for inbound destination for second escortee * blacken * Disaggregate Accessibilities (#5) * initial commit with basic working proto pop gen * fixed bad dependency range * fixed vary_on method to vary all with mapped fields after * added check if already dataframe * added dataframe check if the table passed is already a dataframe * working proto pop gen. still debugging mandatory work/school model * check all table is df * workplace runs, next testing school * began setting up to get all logsums, not just chosen ones * restructured to run as either one-off or model step * revert to last merge. Removed dataframe check in iterate, no longer needed to modify this file * extracted logsums, need to inject into pipeline or save output? * working standalone or step model * extractable accessibilities for fixed and nonmandatory * extractable accessibilities for fixed and nonmandatory * cleanup and add documentation * resolved duplicates of old 'example' folders * model uses write_tables functionality * disaggregate accessibility runs as model step or standalone. Runs as subprocess * working model test. table initialization not yet working * added logsum short circuit to get logsums and avoid drawing unneccesary samples * working model plus major cleanup * working model plus major cleanup * override sample size * fixed trace output files * skip_choice default to False * fixed empty logsums bug * cleanup redundent parameters * fixed list index instead of set * coordinated model run files * added default skip to false * added multiprocessing line * began setup for multiprocessing * fixed sampling problem. Pipeline for multi processing, NOT WORKING YET * deleted run file, not needed anymore * update release instructions * auto-build docs on release * remind to update switcher * need checkout * added helper functions for handling suffix args * to enable multiprocessing, overhauled pipeline method to include proto_ tables rather than overwriting main tables * working multiprocess, but requires debugging. fails on other models * working multiprocess, but requires debugging. fails on other models * cleanup of mp table registering * fixed tracing and slicing issue * removed old 'run' model * setup example 2 zones * minimum working 2 zone * multizone basic working * fixed buggy settings * multiprocessing working, but empty final tables * fixed blank output bug and cleaned up settings to use verbose table names (not just 'disaggregate_accessibility') * cleanup run scripts a bit * fixed missing base path for full run * fixed missing path * fixed typo * fixed 1 per taz sampling * fixing person merge bug and filtering workers * fixed duplicate tours! * updated settings for initialize disagg * removed obsolete file * cleaned up file and moved initialize to tables/... * added find nearest node function * added initialize disaggregate_accessibility to initialize_households * moved initialize steps to 'tables/disaggregate_accessibility' * updated settings to include initialize disaggregate accessibilities as part of initialize_households * moved initialize disagg accessibilities to tables. Created working merge step using naive bayes and 'hard' join * add mp back in * PEP formatting revisions * fixed logsums merge on households instead of persons * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * fixed missing column pipeline error * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * updated dependencies * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * update sampling script * 'blacken' * fixed replacement sample bug * updated documentation * more flexible scenario testing * blacken Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> * Shadow Pricing Enhancements (#7) * updated scripts to include simulation-based shadow pricing * blacken * Updated shadow_pricing.yaml for mtc example * code cleanup * more cleanup * documentation and passing tests * passing tests * passing tests * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * fixing pandas future warning * blacken * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * always updating choices * testing removal of lognormal for hh vot * putting hh vot back in * updating to match sharrow test versions * raw person table for buffer instead of injectable * adding segmentation, output by iteration, and external worker removal * formatting & documentation Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * updating mtc_extended test files * no sp for non-work or school, better logging, weighting options * sample TAZ only if available MAZ when shadow pricing * adding missed weight column option * cleaning up comments Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> * set up testing infrastructure (#40) Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * BayDAG auto ownership configs and test (#41) * set up testing infrastructure * auto ownership test script * auto ownership configs * ao move coef values to coef.csv Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * more formatting * blacken * blacken * blacken * BayDAG parking location choice configs and test (#45) * code changes to fix bug in parking location choice model * parking location choice configs * Revert "code changes to fix bug in parking location choice model" This reverts commit 5a38ebb. * parking location choice bug fix * parking location choice config updates move coefficients to csv file and activitysim variable naming consistency * parking location choice summary Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> * blacken * cdap bug fixes * adding sklearn to dependencies * Update activitysim-dev.yml fixing bad reference to scikit-learn * Update activitysim-test.yml fixing bad reference to scikit-learn * Update setup.cfg fixing bad reference to scikit-learn * Memory Bug Fix * working with 2k no sp * optimize nearest zone determination * Changed data type of participant_id in candidates in joint_tour_participation_candidates() to unsigned 64-bit integer to prevent overflow * better comments * fix overflow in jtp participant id * blacken * forcing participation * Trip Scheduling (#51) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * Trip Scheduling Bug & Trip Mode Choice Annotate (#55) * other sp methods price updates * Trip Scheduling into Resident Debug (#54) * Differentiate examples between quality and validity of example models (#571) * change examples that are no longer tied to an agency to fictional place names * change name of full example also * add back missing output dir * restore test output dir also * more empty dirs that got lost * clean up docs * example_mtc -> prototype_mtc * Prototype MTC extended * add all the ignored files * add test output dirs * remove superfluous example_test * prototype_sf * prototype_arc * prototype_marin * move dirs * psrc * semcog * sandag_xborder * placeholder_sandag * placeholder_multiple_zone * no more coveralls * repair docs * clean up example names * black and isort (#578) * black and isort * stop emitting output dir it fails later tests * trace files in nested directories because windows * swap files for xborder model * repair ARC MP * print checksum even when not used * add hashes for sandag_xborder_full * fix dtype in university hack * fix persons to match tours * repair ARC * Bump version: 1.0.4 → 1.1.0 * Added mwcog small area * missed one edit * reformatting * Update README.MD * call as module * github actions tests * pre commit hooks * pyproject toml * limit numpy * docs for mamba instead of conda * ignore generated files * add nbmake to test env * fix dupe line * repair test multiple zones for github actions * publish develop docs * fix docbuild env * Update .travis.yml * fixed testing files * fixed testing files (again) * fixed test script again * publish docs to branch name * updated testing scripts (note shorter travis script for now) * fixed slash (windows vs. linux testing issue) * added output folders * updated travis script to run all tests, should pass * docs cleaning * docs re-style * rebuild * dynamic versioning docs * version switcher * blacken * fix switcher url * fix conf * switcher update * master to main * deployment actions * actions * build wheel * fix for testpypi * blacken * manual switcher * branch docs service [makedocs] * syntax [makedocs] * travis depends * checkout v3, fix versioning in docs * only build develop docs once * failsafe version * documentation repairs * python-simplified-semver * front cards * end testing w travis * add mwcog test to gh-actions * add mwcog to docs * point to data not copy it * sort dependencies * req sh 2.2.4 * account for variance across platforms in trip dest est * copy bike skims for sandag test * param on rtol * fix sandag_2 test files * fix test file names * added pre-processor option to trip scheduling * trip scheduling relative mode initial commit * moved everything to mwcog example * adding output analysis notebook * adding additional segmentation * testing and documentation * blacken * not assuming scheduling mode is set * fixing merge trip scheduling * still fixing merge * reverting regression trips * fixing bad merge and updating test Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding annotate to trip mode choice * no earliest change if previous trip fail Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> * adding locals_dict to annotate * chooser cols in final trips table * BayDAG merge with ActivitySim v1.2 (#56) * fixed logsums merge on households instead of persons * code cleanup * more cleanup * documentation and passing tests * passing tests * fixed _accessibility suffix * fixed conflict with persons_merged * updated yaml to use simpler join method * PEP formatting fixes * refreshed example folder from develop * added missing line at end of file * black fixes * black fixes to disaggregate accessibility changes * passing tests * ext cli arg * memory sidecar * restart if resume_after checkpoint is missing * no pandas 1.5 yet * stop the sidecar * updated doc on shadow pricing * 2nd Update model doc on shadow pricing * more doc update on shadow pricing * minor repairs * skip when household_income is None * fixed missing column pipeline error * fixing pandas future warning * blacken * merged disagg accessibilities into mtc_extended and added doc section * ran black on disaggregate_accessibility.py * bug in trying to access shadow price settings when not running shadow pricing * limiting pandas version * updated dependencies * always updating choices * removing sklearn imports * blacken * add if none catch * fixed None suffix default * moved order of get_table(persons_merged) to avoid pulling prematurely in xborder * testing removal of lognormal for hh vot * putting hh vot back in * tested and cleaned up rng channels * setup injectable suffixes to allow add_size_table as model step not just function * removed accessibility output from test * re blacken py scripts * updating to match sharrow test versions * fixed tracing typo * added variable index name suffix to pass optionally * pipeline housekeeping to cleanup any tables, traceables, or channels that were touched during disagg * added multiprocess testing * blacken updates * updated test scripts to include MP, problem with vehicle model in mp (even without disagg acc?) * added improved origin sampling, resolved issue with merging with sample <100%. Need to address random seed for origins * added sci-kit learn to test depends * fixed person merging error causing pytest fail, uses inject method to ensure consistency * cleanup comments * fixed pytest to include accessibility table in regress * setup for mp test, but needs debugging * 'blacken' * 'blacken' * cleanup example folder * fixed pipeline NoneType bug for disagg accessibility table * raw person table for buffer instead of injectable * add mp test for prototype_mtc_extended * fixed pytest fail on mp, due to exept:True on mp_simulate * 'blacken' * added weighted k-means method * created run script for multiple sampling scenarios * blacken changes * blacken * fixed copy script * blacken sampling script * fixed n_zone when integer * fixed typo * Update random.py * Updated test environment to reflect changes in pandas * Removed random random seed generation from placeholder_sandage 1-zone test configuration to get example to pass automated test * update sampling script * 'blacken' * fixed replacement sample bug * adding segmentation, output by iteration, and external worker removal * updated documentation * more flexible scenario testing * blacken * Added test_random_seed.py * blacken test_random_seed.py * Moved random seed generation testing out of prototype_mtc folder and edited core_tests.yaml to call it * Corrected name of check_outputs() * Added print statements to debug script * Blacken test_random_seed.py * keep alternative attributes in parking location * move coeff values to coeff csv * Added pipe character to call that tests the random generator * Added explicit call for pytest to run test_random_seed.py * Added print statement at start of script for debugging * Replaced single quotes with double quotes in print statement * reformat with Black * Moved random seed test into activitysim folder * Edited core_tests.yml to reflect change in location of random seed test * Renamed tests folder to test to reflect call in core-tests.yml * formatting & documentation * Added test_random_seed function for PyTest to read * Fixed defition of seeds list and removed print statements * updating github test env * responding to review comments * Added line to create output folder as that's not being committed * create_rng_configs() now copies entire example configs directory instead of just settings.yaml * Added try except statement when creating the output directory in case it already exists * additional logging, random seed option, landuse sample weight column * ensuring TAZ is not selected if no available MAZ * adding logic to skip external location choice models * Applied suggested changes * Removed activitysim\test\random_seed\configs directory to reduce confusion * Moved random seed test directory to folder that had already existed * temporarily constrain pandas #608 * work around psutil runtimeerror * temp constrain pandas * add mwcog full example * review responses * revisions per Sijia's comments, except for the proto-table-template implementation, still working. * added template pop option * blacken * set back to create_tables to pass test against old tables * updated proto-pop test data * resolved bad test data issue * warn don't fail on duplicate skims * include sharrow in mwcog example * cleanup * zarr digital encoding for mwcog * include reference in psrc mini * fow window ids to int64 because windows * handle expected warnings * unpin dependencies * columns cannot be a set * unpin pandas * columns cannot be a set * numeric_only args in groupby.sum * docs: correct the unit of `chunk_size`. * change 'arry' to more readable 'sizearray' * repair tests * catch FileNotFound * add check that land use is zero-based when using sharrow * better docs on skims in shared memory * better docstrings for skimdataset * remove old code * remove junk * add logging for recoding * optimize nearest zone determination * consistent multiprocessing results * blacken * updating regression trips * adding sandag 2-zone test * blacken * fix merge error * allow pandas 1.5 again * sharrow compatibility with #606 * remove outdated code in comments * note on tracing limitation * allow repeating key cols * fix decoding in MP output * escortee modes match chauf modes * updating regression tests * fixing bad var name in inbound expressions * add note about `condense_parameters` * change default condense_parameters to False * Update .gitignore Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> * ignore caches * remove special install instructions * remove sharrow_skip's * Revert "remove sharrow_skip's" This reverts commit 6b52af2. * add note about why sharrow_skip is activated * Update school_escorting.yaml * Update config.py * arc trip destination spec skim correction * update regression trips * require sharrow 2.5 * fix mtc_ext for sharrow * fix test consistent with escort mode alignments * allow sharrow skipping * remove stray indent * delete expression values after sharrow testing to make debugging easier * require sharrow 2.5.2 * recode only once * testing repairs * note about why sharrow_skip * fork mtc_extended testing on shadow pricing and sharrow * note on sharrow_skip * size term scaling only for full run * reordering * multiprocessing hangs! * never scale size terms for disagg * tally pending persons * tests cleanup * fix error with orca * let pipeline tables be dropped * check on available MAZs, comment cleanup * work zone to -1 if wfh, removed unneeded extensions * fix tests for sandag 2zone * ignore deprecation warning in tests not clear why this started being a problem suddenly in only the xborder-MP model * add scikit-learn to formal dependencies * docs update for installer * fixing black to 22.12.0 * missed merge conflicts * fixing merge issues in prototype_semcog * fixing prototype_arc merge * fixing placeholder_sandag merge issues * blacken * fixing mwcog merge issues * skims not found during estimation test --------- Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Jeff Newman <jeffnewman@camsys.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: Joe Flood <joejimflood@gmail.com> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * do not require all alts in data file * int8 to int16 lost in v1.2 merge --------- Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * docs: apply a minor correction to user guides (#659) * Trip scheduling logic (#660) * trip scheduling logic_version * in testing ignore the warning we just added * cannot use logic_version 1 with relative scheduling * Pin Dependencies (#665) * pinderella * pandas in setup.cfg deps * Updated SEMCOG Example (#603) * initial example_semcog commit * documentation * single process passing but not multiprocess * testing infrastructure * blacken * formatting * implemented stable sample for university extensions * adding ignored output folder * removed squared term and re-estimated * updating test env * calibrated configs * fixing bad merge * updated configs * reading in extension folder * updated shadowpricing yaml file * updated test regress * Revert "updated test regress" This reverts commit 8d5af7d. * updated regress test table * updated test regress table * updated cropped land use and skim * updated shadow pricing method * updated network_los to read segmented skims if needed * updated example_manifest.yaml * fixing conflicts * making fixes per review comments * push mistake! * Revert "making fixes per review comments" This reverts commit c05c7f3. * Revert "Revert "making fixes per review comments"" This reverts commit d83019a. * added back accidentally untracked output folder + updated regress table * misc small fixes --------- Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com> * syncronize (#680) issue templates into develop --------- Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: aletzdy <58451076+aletzdy@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> * added documentation * no input checker to test develop merge * testing state object in input checker * adding pandera to dependencies * getting settings in sync * data_model_dir, checker logging, network data * allowing None for trace and resume_after settings * documentation * blacken * data_model dir added to test * cleanup * multiple errors & warnings * clarified warning msgs, fixed error counts * added auxiliary logging to input_checker * Added more descriptive input checker test names * Added info-level input checker logging * in-line documentation cleanup * test_input_checker initial commit (not passing) * Clean up input checker log message styles * Add MTC example input checks, cleanup * reformat code with black * Fixed pytest fixture scope issue * change networklinks path to platform-agnostic path * add input checker to mtc extended test * Input checker bugfixes, added SEMCOG example - Updated pytables dependency version to fix deprecation warnings - Added flexible resolve for external input checker file paths (can be absolute paths or paths relative to one of the data directories) - Added data_model directory to prototype_mtc_example files - Added input_checker config yamls to SEMCOG example - Added sample network data to SEMCOG example * Add SEMCOG input check files * Formatting previous commit * Add missing file handling to input checker * Blackening previous commit * Added input checking relative to calling dir * cleanup and documentation * Input checker path bugfix, MTC reversion * suspend buggy test Suspend test per ActivitySim issue #781 * fix progressive test * fix external url * drop extra file * remove extra imports * remove vscode file * pydantic not implemented comments --------- Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com> Co-authored-by: Lisa Zorn <lzorn@bayareametro.gov> Co-authored-by: Sijia Wang <wangsijia0628@gmail.com> Co-authored-by: Ashish Kulshrestha <ashish.kulshrestha@wsp.com> Co-authored-by: Jeffrey Newman <jeffnewman@camsys.com> Co-authored-by: Andrew Rohne <andrew@siliconcreek.net> Co-authored-by: Nick Fournier <nick.fournier@rsginc.com> Co-authored-by: Nick Fournier <99497883+nick-fournier-rsg@users.noreply.github.com> Co-authored-by: David Hensle <davidh@sandag.org> Co-authored-by: JoeJimFlood <joejimflood@gmail.com> Co-authored-by: Jeffrey Newman <jeff@newman.me> Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com> Co-authored-by: Will <will.alexander@rsginc.com> Co-authored-by: Jeff Newman <jeff@driftless.xyz>
jpn-- pushed a commit
that referenced
this pull request
Mar 28, 2024
* sampling in EDB for location choice * sampling in EDB for location choice * blacken
m-richards added a commit
to m-richards/activitysim
that referenced
this pull request
May 9, 2026
(Squash of ActivitySim#1064 as of fcef6b3) Co-authored-by: Jan <jan@outerloop.io> Co-authored-by: Tom Stephen <tom.stephen@icloud.com> Co-authored-by: Tyler Pearn <tyler@outerloop.io> commit fcef6b3 Merge: 08b2b0310db123 Author: Jan <jan@outerloop.io> Date: Sat Apr 11 19:34:40 2026 +1000 Merge pull request ActivitySim#7 from outerl/deterministic-alt-sample-randoms Deterministic alt sample randoms commit 10db123 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 17:26:45 2026 +1000 doco update commit e9fb130 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 16:31:27 2026 +1000 disable arc sharrow test until regress trips are updated commit d7c1345 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 14:16:20 2026 +1000 trip scheduling comment for EET commit f2d7bfa Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:44:23 2026 +1000 removes outdated comment commit 8d7ae41 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:25:01 2026 +1000 updates arc regress files commit 3bd3251 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:09:51 2026 +1000 no alts_context for trip_scheduling commit 12a3d8a Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:05:01 2026 +1000 Revert "Deterministic randoms when adding/removing tours for trip scheduling choice" This reverts commit 2d181b2. commit 6d29f18 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:01:59 2026 +1000 re-instate arc tests commit 834fc90 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 08:56:08 2026 +1000 re-add arc test, remove parking choice column from regress trips commit 19750a0 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 07:15:25 2026 +1000 updates outdated comment commit 531b562 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:44:15 2026 +1000 linting commit bc56a87 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:32:14 2026 +1000 PR noise, make sure alts_context built on un-modified alternatives in trip_dest commit 7a22612 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 15:00:25 2026 +1000 Roll back final_trips.csv for production_semcog commit cfe6166 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:47:52 2026 +1000 PR noise commit 2d181b2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:30:08 2026 +1000 Deterministic randoms when adding/removing tours for trip scheduling choice commit 47ed600 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 09:46:03 2026 +1000 Commenting/fix alts context constructions, update semcog test commit 89dbe5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 17:47:30 2026 +1000 Tidy, complete implementation of alts_context, add tests, rebuild regress for multi zone tests commit 0d2356e Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 13:46:47 2026 +1000 Copy changes from m-richards:matt/poisson_eet_2026_04 commit 08b2b03 Merge: d5a8fd4c786919 Author: Jan <jan@outerloop.io> Date: Thu Apr 9 09:28:15 2026 +1000 Merge pull request ActivitySim#6 from outerl/explicit_error_terms-multiple_zone_test Adds 2 zone tests commit c786919 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 22:17:33 2026 +1000 progressive 2 zone test commit 7c96cbc Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 20:08:58 2026 +1000 base seed same as non-eet, update regress eet data commit 9661d01 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:17:37 2026 +1000 re-add 3-zone tests commit 5b24d44 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:11:51 2026 +1000 add back accidentally removed import commit f5b6301 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:47:25 2026 +1000 Change formatting from using ruff to black commit 033f08a Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:42:10 2026 +1000 Add eet multiple zone test for zone=2 commit d5a8fd4 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 20:47:48 2026 -0300 no need to restrict to specific choosers for reset, each process has its own state commit d50ad3c Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 16:41:33 2026 +1000 semcog test with different seed for eet mp to work around non-determinism in trip_scheduling (probabilistic, no EET branch) commit 220c5cf Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 10:41:15 2026 +1000 mp rng reset, disabling one new test for no commit 22a4f62 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:59:54 2026 +1000 disable test unitl further investigation commit 7209985 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:41:52 2026 +1000 lint commit be3a270 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:35:58 2026 +1000 testing for semcog model, update to shadow pricing reset commit c5bd23f Merge: 5604b3ea7e8529 Author: Jan <jan@outerloop.io> Date: Fri Apr 3 04:28:44 2026 +1000 Merge pull request #3 from outerl/jzill/runtime_improvement Testing, documentation, runtime improvement commit a7e8529 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:52:41 2026 +1000 undo changes in unrelated code to reduce noise commit 7959c94 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:38:03 2026 +1000 clean up doco commit d674268 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:14:39 2026 +1000 memory usage doco commit 837ae41 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:03:06 2026 +1000 doco clean up commit 2d1dbcb Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:59:29 2026 +1000 doco re memory commit f542e58 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:53:58 2026 +1000 doco clean up commit 8c74d2a Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:55:08 2026 +1000 docs commit 605366f Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:38:41 2026 +1000 doc fix commit 1d139e0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 10:10:30 2026 +1000 Fix failing tests commit 0da80bf Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:47:52 2026 +1000 . commit 21daa5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:44:16 2026 +1000 Revert linting changes commit 40b0b06 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:58:15 2026 +1000 add scale comment commit a0bc5ba Merge: 661c6b3b455e2a Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:54:33 2026 +1000 Merge branch 'jzill/runtime_improvement' of github.com:outerl/activitysim into jzill/runtime_improvement commit 661c6b3 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:53:39 2026 +1000 doco part two commit a490999 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 20:34:51 2026 +1000 eet doco start commit b455e2a Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 17:02:02 2026 +1000 Roll back validate_utils commit a73f6ea Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:28:31 2026 +1000 Fix test commit dd54711 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:06:18 2026 +1000 Linting commit 3270474 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:01:53 2026 +1000 Shuffle check to logit.py commit c1806fc Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 15:56:31 2026 +1000 Close out remaining TODO-EETs commit cc8fda0 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:19:41 2026 +1000 reset rng only for eet for now. discuss in engineering meeting commit d491e45 Merge: 1aa85ba6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:10:05 2026 +1000 Merge branch 'jzill/runtime_improvement' into jzill/reset_rng_on_shadow_pricing commit 6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:40:26 2026 +1000 clean up commit ae71433 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:14:09 2026 +1000 lint commit 52f75fa Merge: 4e0c7e8b021cee Author: Jan <jan@outerloop.io> Date: Tue Mar 31 13:10:19 2026 +1000 Merge pull request #5 from outerl/tom/nested-logit-tests-and-docs Extend logit tests, add model tests, add simulate tests, draft docs commit b021cee Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:29:12 2026 +1000 Finish removing nest_spec definition in simulate.py tests commit b62001e Merge: 743c56f4debaad Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:28:20 2026 +1000 Merge with Tom's linting changes commit 743c56f Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:20:25 2026 +1000 Move nest_spec to a fixture in simulate.py tests commit 4debaad Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 11:17:03 2026 +1000 Linting commit f55b2cd Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 10:59:30 2026 +1000 Add test for compute_nested_utilities. Computes nested utilities on a toy example and compares the result commit 65fd171 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 08:50:37 2026 +1000 Implement Jan's suggestion of how to calculate household ids for testing cdap eet parity commit d0a6429 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 26 20:09:33 2026 +1000 roll back changes to core tests to minimize noise commit 362eef0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 24 09:37:18 2026 +1000 Linting, minor changes to test_simulate.py commit f628505 Author: Tyler Pearn <tyler@outerloop.io> Date: Mon Mar 23 17:02:46 2026 +1000 Add tests checking that choices made using eet and from probabilities are the same for eval_mnl and eval_nl commit 76cacb2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 17:19:37 2026 +1000 Add basic docs for EET commit bd4211f Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 16:38:56 2026 +1000 Add tests for logit NL, ordering, and all models using EET commit 1aa85ba Author: Jan Zill <jan@outerloop.io> Date: Sun Mar 22 16:36:23 2026 +1000 reset rng offset on iterate_location_choice (shadow pricing) commit 4e0c7e8 Author: Jan Zill <jan@outerloop.io> Date: Fri Mar 20 14:08:37 2026 +1000 make test clearer commit 1b2b6dc Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 19:55:46 2026 +1000 interaction_sample test to catch index order bug commit fa54204 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:40:37 2026 +1000 numpy not loop commit 1213b56 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:27:35 2026 +1000 reinstate test, up number of draws for comparison commit 5e9847d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:10:02 2026 +1000 series not array commit 1df7d0d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:02:31 2026 +1000 unify mc and eet reporting during choice making commit 6440d3f Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:34:47 2026 +1000 undo stray comment commit 73f45fe Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:29:59 2026 +1000 reshape, do not flatten for potential performance commit cf92aad Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:44:41 2026 +1000 Normalise number of choosers, alternatives and minimum tolerance for EET comparison tests commit df574ee Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:35:29 2026 +1000 Linting commit a7f2e8f Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:30:02 2026 +1000 Fix, complete tests for interaction sample, simulate commit a9db131 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 17 12:04:56 2026 +1000 Add basic with/without EET test for interaction simulate commit 9d69dab Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 16 17:15:28 2026 +1000 add tests, docstrings for logit commit f97185e Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 bug fix: order of chooser_idx in interaction_simulate commit 60a744a Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 no duplicate arrays commit 710b3b0 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 memory reduction commit 5c506f1 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 np array instead of for loop commit 5604b3e Merge: 6f31c7682f1f7d Author: Jeffrey Newman <jeff@driftless.xyz> Date: Fri Mar 13 08:46:09 2026 -0500 Merge pull request ActivitySim#1042 from driftlesslabs/eet update EET feature branch commit 82f1f7d Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 12 23:01:52 2026 -0500 update larch pin to 6.0.46 commit 0754bb0 Merge: 45ab2cab8297d2 Author: Jeff Newman <jeff@driftless.xyz> Date: Tue Mar 10 14:22:59 2026 -0500 Merge branch 'main' into eet commit 45ab2ca Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 14:02:37 2026 -0500 blacken commit 57ba5bc Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 13:50:26 2026 -0500 fix unbound variable in estimation mode commit 7fe8746 Merge: 0c0f77e6f31c76 Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 5 12:39:08 2026 -0600 Merge branch 'explicit_error_terms_2' # Conflicts: # activitysim/core/configuration/top.py # activitysim/core/interaction_sample.py commit 6f31c76 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 13:11:31 2025 +1000 fix allow_zero_probs for prob calculation in EET interaction_sample commit 3b48a07 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:26:11 2025 +1000 lint commit 66cdac9 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:23:42 2025 +1000 consistently treat utilities that would lead to zero choices in MC simulation commit e102a9e Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 09:17:47 2025 +1000 adds validate utility method to align with unavailable choices in MC simulation commit 94e629a Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 22:10:43 2025 +1000 patch other instance of padded_utility for eet commit 5636cd9 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 21:09:25 2025 +1000 lint commit c40b989 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 20:55:47 2025 +1000 avoid choosing alternatives corresponding to padded utilities in interaction_sample_simulate commit 49fcaa5 Merge: 582c998146c7ff Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 14:51:11 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 582c998 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:52:14 2025 +1000 comment clean up commit 41d49ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:39:59 2025 +1000 clean up comments commit 1f815e8 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:24:21 2025 +1000 remove comment commit ef0be21 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:06:06 2025 +1000 fix nest_spec is None bug commit 2a563ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:39:50 2025 +1000 lint commit 5de1d23 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:29:10 2025 +1000 compute settings in disaggreagte accessibility w/o hack commit 28142cd Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:59:04 2025 +1000 fix bool conversion of None for eet compute settings in sub-components commit fc68697 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:40:31 2025 +1000 fix _interaction_sample return doc commit 3793ec2 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:36:30 2025 +1000 fix no sampling in interaction_sample commit d6ecb0d Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:51:17 2025 +1000 update comments commit 892c3fb Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:39:37 2025 +1000 move interaction sample without sampling out of MC loop to enable for both MC and eet commit 9900f48 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 19:23:41 2025 +1000 lint commit 0fa183e Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 11:15:07 2025 +1000 jtp custom chooser for EET commit 9a0fb66 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 08:32:05 2025 +1000 more comments commit 9d12b08 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 07:55:04 2025 +1000 comments commit 6f8958b Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:54:06 2025 +1000 lint commit 5637fb0 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:41:00 2025 +1000 test SOA MC for disagg access commit 6a0987d Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:31:56 2025 +1000 identifies eet todos commit c6d60c6 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:23:30 2025 +1000 comment clean up commit 5105b17 Merge: 30ddb3ede6d0ef Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 03:38:42 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 30ddb3e Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:44:54 2025 +1000 default compute settings set before, no need to check if none commit 11d86a1 Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:34:05 2025 +1000 Adds subcomponent-specific eet setting commit 0f54cec Author: Jan Zill <jzill@anl.gov> Date: Sun Apr 6 20:07:50 2025 +1000 compute_setting overrides for eet, currently only for interaction_sample to test loc sampling with MC commit f5f365f Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:23:57 2025 +1000 removes notebook folder commit 73b8c32 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:14:44 2025 +1000 sign on logsum commit 14441a6 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 16:26:28 2025 +1000 corr commit e1e9d08 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 15:48:46 2025 +1000 seeding corr test commit 114b747 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 14:37:12 2025 +1000 some variation checks, dev notebooks, to delete commit c6feaef Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 18:17:34 2025 +1000 log eet setting on start up commit 75bb84d Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:56:50 2025 +1000 more merge fixes, example runs through commit 08d013a Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:49:10 2025 +1000 more merge bugs commit 792d183 Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:24:25 2025 +1000 merge bug commit b86093f Merge: 9a17395bf64b7b Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:00:53 2025 +1000 Merge branch 'master' into janzill/utilit_based_choices_2025 commit 9a17395 Merge: 6b0b4e9ae7fa43 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jan 31 15:41:45 2023 +1000 resolves merge conflicts with main v1.2 commit 6b0b4e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 27 11:13:44 2022 +1000 memory logging commit c0d1ca1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 16:04:36 2022 +1000 gumbel by hand by inverse cdf commit 3973bcd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:34:24 2022 +1000 clean up commit 6451abd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:24:33 2022 +1000 use numpy's gumbel to draw from ev1 commit 313bcd0 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 15:16:51 2022 +1000 remove scale and location params from ev1 quartile fct commit 26a7090 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 13:59:47 2022 +1000 interaction sample dev commit d6f4f97 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 07:29:51 2022 +1000 remove comment commit 7df4c8d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:36:17 2022 +1000 to numpy once commit 7a66a67 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:10:00 2022 +1000 set index commit c6d75d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:03:21 2022 +1000 delete after last ref, not before commit 78630be Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:01:39 2022 +1000 spelling commit 2568b72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:00:59 2022 +1000 memory work commit e0555d4 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 22:43:13 2022 +1000 interaction_sample memory saving implementation commit 47601e3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:18:40 2022 +1000 bug fix commit 2ec41b1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:00:53 2022 +1000 mem tracing in interaction_sample commit 4c6a524 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 19:47:07 2022 +1000 custom chooser commit dbc809a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:05:10 2022 +1000 add utility based choice option for transit virtual pathbuilder commit b449593 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:02:29 2022 +1000 bug fix commit f6d81d6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:57:00 2022 +1000 bug fix commit f0143e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:54:36 2022 +1000 remove false comparison commit 7a6cc29 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:38:34 2022 +1000 need probs in interaction_sample - try it the quick way commit 4f825ae Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:22:29 2022 +1000 style fixes commit 417e90f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:17:44 2022 +1000 wrong method in cdap commit f0cc563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:16:05 2022 +1000 interaction_sample util based w/p probs commit cb807d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:35:49 2022 +1000 remove usage of choose_individual_max_utility commit eea84ca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:31:14 2022 +1000 remove usage of choose_individual_max_utility commit 8ac91f1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:28:39 2022 +1000 remove usage of choose_individual_max_utility commit 0387c35 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:27:33 2022 +1000 remove usage of choose_individual_max_utility commit 6b38f12 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:26:48 2022 +1000 remove usage of choose_individual_max_utility commit affe2b6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:21:32 2022 +1000 remove usage of choose_individual_max_utility commit 17792f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:13:49 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit b48dd71 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:09:57 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 4b5cad2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:02:52 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f9b1e2e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 15:59:30 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 043a0bd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:53:12 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f890799 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:36:24 2022 +1000 fake rand tracing commit d14fac3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:34:40 2022 +1000 memory saving work - delete dfs wherever possible commit c26c80c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:58:25 2022 +1000 no fru for probabilitic lookup tables commit 087ec0e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:20:34 2022 +1000 use fru in models that use logit.make_choices w/o simulate wrapper commit 8c16765 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:56:29 2022 +1000 make choice indexing for nested logit consistent with mnl and cumsum MC commit 61a314f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:30:07 2022 +1000 move reporting in make choices commit 19d1222 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:22:54 2022 +1000 remove debug print statement commit 9685aca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:06:50 2022 +1000 make place of call consistent commit 8c1d1ed Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:30:45 2022 +1000 pass arguments in commit 7fbba93 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:03:39 2022 +1000 fies frozen_rand setting call commit bbce6aa Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 13:52:33 2022 +1000 nested index instead of name commit 005b131 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:29:01 2022 +1000 adds interaction_sample at the module level, not individual model commit 00208e7 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:24:49 2022 +1000 adds interaction_sample at the module level, not individual model commit e3e4326 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 09:14:45 2022 +1000 interaction sample frozen rand indiv util commit 64c4e6e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 08:57:18 2022 +1000 fixes alternative index as chosen value commit 36789a3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 18:54:04 2022 +1000 interaction_sample dev work commit 9950f84 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 13:28:45 2022 +1000 interaction_sample dev work commit e65635d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 12:55:01 2022 +1000 interaction sample notebook commit 9ac51c9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 20:22:41 2022 +1000 usage of interaction_sample_simulate commit f3e1610 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:41:11 2022 +1000 add setting to interaction_simulate call commit 1d4ca9a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:39:22 2022 +1000 froxen rand ind util in interaction simulate commit 1a786f2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:33:05 2022 +1000 implement flag in settings, apply to all simple simulate models commit f725ca6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:05:13 2022 +1000 pass through frozen_impl flag commit 0c6f4c8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:03:06 2022 +1000 nested now with alternative numbers, not names, change structure to be more consistent with current impl commit 7694563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 15:48:51 2022 +1000 simple siumlate mnl frozen rand ind util commit 921983f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 10:53:07 2022 +1000 adds more convergence analysis commit 8668383 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 00:26:03 2022 +1000 nicer comparison commit 75c16a2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 21:26:02 2022 +1000 validation commit 3700a9e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 17:43:32 2022 +1000 some validation metrics commit 42901bf Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 16:15:51 2022 +1000 adds goodness of fit test and loop over all trips commit 7bfb80a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 15 22:32:41 2022 +1000 adds comment regarding potential random choice runtime improvement commit e821b57 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 14:12:29 2022 +1000 nest scaling comment commit fba8728 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 13:10:43 2022 +1000 nest scales in asim seem to be all between 0 and 1, so not like in larch where they are non-increasing - re-adjust util calc. should really document this somewhere commit 4d0d823 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 01:10:24 2022 +1000 inspecting a couple of test cases commit 4ee74ea Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:40:11 2022 +1000 clean up commit e02b46a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:35:23 2022 +1000 compare to larch probs commit ebf64c6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 9 17:23:50 2022 +1000 larch notebook to calculate probs a different way commit 7984392 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:45:27 2022 +1000 removes trace in runtime tests commit 6c17d89 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:26:14 2022 +1000 caching nest level names and alternatives commit 9f4d262 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:32:31 2022 +1000 check commit c95f68d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:15:41 2022 +1000 fixes bug in choice for tree commit 1286183 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:57:43 2022 +1000 output clean up commit 932d5ad Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:41:13 2022 +1000 scaling in recursive nest utilities commit 7c21407 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 13:27:26 2022 +1000 adds nested utility scale commit b60702b Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:21:50 2022 +1000 clean up commit 4883c33 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:13:41 2022 +1000 recursive utility calculation fix commit f2cea72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 11:59:01 2022 +1000 two level still off commit fd5ca14 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 21:18:50 2022 +1000 fixes scale of nest utilities commit ab8a212 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:11:42 2022 +1000 probs validation clean up commit a31d97f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:08:14 2022 +1000 probs trip set up commit 5e8bf16 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 12:56:34 2022 +1000 towards validation of probs for single trip commit 5a7ad3c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:41:58 2022 +1000 pull out cruft commit 83a86f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:01:29 2022 +1000 scale of leaf utility commit 5dc1a44 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 22:11:12 2022 +1000 baby steps towards validation commit c6b609a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 21:43:07 2022 +1000 prototype simple_simulate commit a4a7630 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 20:53:30 2022 +1000 adds choice based on walking nest levels commit c973be8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 15:52:43 2022 +1000 prototype work - return leaf and node (exp max) utilities, nest spec commit ec8ae75 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 3 21:10:55 2022 +1000 notebook dev, adds nest coefficient in logit.py
m-richards added a commit
to m-richards/activitysim
that referenced
this pull request
May 9, 2026
(Squash of ActivitySim#1064 as of fcef6b3) Co-authored-by: Jan <jan@outerloop.io> Co-authored-by: Tom Stephen <tom.stephen@icloud.com> Co-authored-by: Tyler Pearn <tyler@outerloop.io> commit fcef6b3 Merge: 08b2b0310db123 Author: Jan <jan@outerloop.io> Date: Sat Apr 11 19:34:40 2026 +1000 Merge pull request ActivitySim#7 from outerl/deterministic-alt-sample-randoms Deterministic alt sample randoms commit 10db123 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 17:26:45 2026 +1000 doco update commit e9fb130 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 16:31:27 2026 +1000 disable arc sharrow test until regress trips are updated commit d7c1345 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 14:16:20 2026 +1000 trip scheduling comment for EET commit f2d7bfa Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:44:23 2026 +1000 removes outdated comment commit 8d7ae41 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:25:01 2026 +1000 updates arc regress files commit 3bd3251 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:09:51 2026 +1000 no alts_context for trip_scheduling commit 12a3d8a Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:05:01 2026 +1000 Revert "Deterministic randoms when adding/removing tours for trip scheduling choice" This reverts commit 2d181b2. commit 6d29f18 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:01:59 2026 +1000 re-instate arc tests commit 834fc90 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 08:56:08 2026 +1000 re-add arc test, remove parking choice column from regress trips commit 19750a0 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 07:15:25 2026 +1000 updates outdated comment commit 531b562 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:44:15 2026 +1000 linting commit bc56a87 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:32:14 2026 +1000 PR noise, make sure alts_context built on un-modified alternatives in trip_dest commit 7a22612 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 15:00:25 2026 +1000 Roll back final_trips.csv for production_semcog commit cfe6166 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:47:52 2026 +1000 PR noise commit 2d181b2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:30:08 2026 +1000 Deterministic randoms when adding/removing tours for trip scheduling choice commit 47ed600 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 09:46:03 2026 +1000 Commenting/fix alts context constructions, update semcog test commit 89dbe5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 17:47:30 2026 +1000 Tidy, complete implementation of alts_context, add tests, rebuild regress for multi zone tests commit 0d2356e Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 13:46:47 2026 +1000 Copy changes from m-richards:matt/poisson_eet_2026_04 commit 08b2b03 Merge: d5a8fd4c786919 Author: Jan <jan@outerloop.io> Date: Thu Apr 9 09:28:15 2026 +1000 Merge pull request ActivitySim#6 from outerl/explicit_error_terms-multiple_zone_test Adds 2 zone tests commit c786919 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 22:17:33 2026 +1000 progressive 2 zone test commit 7c96cbc Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 20:08:58 2026 +1000 base seed same as non-eet, update regress eet data commit 9661d01 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:17:37 2026 +1000 re-add 3-zone tests commit 5b24d44 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:11:51 2026 +1000 add back accidentally removed import commit f5b6301 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:47:25 2026 +1000 Change formatting from using ruff to black commit 033f08a Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:42:10 2026 +1000 Add eet multiple zone test for zone=2 commit d5a8fd4 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 20:47:48 2026 -0300 no need to restrict to specific choosers for reset, each process has its own state commit d50ad3c Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 16:41:33 2026 +1000 semcog test with different seed for eet mp to work around non-determinism in trip_scheduling (probabilistic, no EET branch) commit 220c5cf Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 10:41:15 2026 +1000 mp rng reset, disabling one new test for no commit 22a4f62 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:59:54 2026 +1000 disable test unitl further investigation commit 7209985 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:41:52 2026 +1000 lint commit be3a270 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:35:58 2026 +1000 testing for semcog model, update to shadow pricing reset commit c5bd23f Merge: 5604b3ea7e8529 Author: Jan <jan@outerloop.io> Date: Fri Apr 3 04:28:44 2026 +1000 Merge pull request #3 from outerl/jzill/runtime_improvement Testing, documentation, runtime improvement commit a7e8529 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:52:41 2026 +1000 undo changes in unrelated code to reduce noise commit 7959c94 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:38:03 2026 +1000 clean up doco commit d674268 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:14:39 2026 +1000 memory usage doco commit 837ae41 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:03:06 2026 +1000 doco clean up commit 2d1dbcb Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:59:29 2026 +1000 doco re memory commit f542e58 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:53:58 2026 +1000 doco clean up commit 8c74d2a Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:55:08 2026 +1000 docs commit 605366f Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:38:41 2026 +1000 doc fix commit 1d139e0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 10:10:30 2026 +1000 Fix failing tests commit 0da80bf Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:47:52 2026 +1000 . commit 21daa5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:44:16 2026 +1000 Revert linting changes commit 40b0b06 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:58:15 2026 +1000 add scale comment commit a0bc5ba Merge: 661c6b3b455e2a Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:54:33 2026 +1000 Merge branch 'jzill/runtime_improvement' of github.com:outerl/activitysim into jzill/runtime_improvement commit 661c6b3 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:53:39 2026 +1000 doco part two commit a490999 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 20:34:51 2026 +1000 eet doco start commit b455e2a Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 17:02:02 2026 +1000 Roll back validate_utils commit a73f6ea Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:28:31 2026 +1000 Fix test commit dd54711 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:06:18 2026 +1000 Linting commit 3270474 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:01:53 2026 +1000 Shuffle check to logit.py commit c1806fc Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 15:56:31 2026 +1000 Close out remaining TODO-EETs commit cc8fda0 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:19:41 2026 +1000 reset rng only for eet for now. discuss in engineering meeting commit d491e45 Merge: 1aa85ba6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:10:05 2026 +1000 Merge branch 'jzill/runtime_improvement' into jzill/reset_rng_on_shadow_pricing commit 6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:40:26 2026 +1000 clean up commit ae71433 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:14:09 2026 +1000 lint commit 52f75fa Merge: 4e0c7e8b021cee Author: Jan <jan@outerloop.io> Date: Tue Mar 31 13:10:19 2026 +1000 Merge pull request #5 from outerl/tom/nested-logit-tests-and-docs Extend logit tests, add model tests, add simulate tests, draft docs commit b021cee Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:29:12 2026 +1000 Finish removing nest_spec definition in simulate.py tests commit b62001e Merge: 743c56f4debaad Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:28:20 2026 +1000 Merge with Tom's linting changes commit 743c56f Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:20:25 2026 +1000 Move nest_spec to a fixture in simulate.py tests commit 4debaad Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 11:17:03 2026 +1000 Linting commit f55b2cd Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 10:59:30 2026 +1000 Add test for compute_nested_utilities. Computes nested utilities on a toy example and compares the result commit 65fd171 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 08:50:37 2026 +1000 Implement Jan's suggestion of how to calculate household ids for testing cdap eet parity commit d0a6429 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 26 20:09:33 2026 +1000 roll back changes to core tests to minimize noise commit 362eef0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 24 09:37:18 2026 +1000 Linting, minor changes to test_simulate.py commit f628505 Author: Tyler Pearn <tyler@outerloop.io> Date: Mon Mar 23 17:02:46 2026 +1000 Add tests checking that choices made using eet and from probabilities are the same for eval_mnl and eval_nl commit 76cacb2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 17:19:37 2026 +1000 Add basic docs for EET commit bd4211f Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 16:38:56 2026 +1000 Add tests for logit NL, ordering, and all models using EET commit 1aa85ba Author: Jan Zill <jan@outerloop.io> Date: Sun Mar 22 16:36:23 2026 +1000 reset rng offset on iterate_location_choice (shadow pricing) commit 4e0c7e8 Author: Jan Zill <jan@outerloop.io> Date: Fri Mar 20 14:08:37 2026 +1000 make test clearer commit 1b2b6dc Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 19:55:46 2026 +1000 interaction_sample test to catch index order bug commit fa54204 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:40:37 2026 +1000 numpy not loop commit 1213b56 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:27:35 2026 +1000 reinstate test, up number of draws for comparison commit 5e9847d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:10:02 2026 +1000 series not array commit 1df7d0d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:02:31 2026 +1000 unify mc and eet reporting during choice making commit 6440d3f Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:34:47 2026 +1000 undo stray comment commit 73f45fe Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:29:59 2026 +1000 reshape, do not flatten for potential performance commit cf92aad Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:44:41 2026 +1000 Normalise number of choosers, alternatives and minimum tolerance for EET comparison tests commit df574ee Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:35:29 2026 +1000 Linting commit a7f2e8f Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:30:02 2026 +1000 Fix, complete tests for interaction sample, simulate commit a9db131 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 17 12:04:56 2026 +1000 Add basic with/without EET test for interaction simulate commit 9d69dab Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 16 17:15:28 2026 +1000 add tests, docstrings for logit commit f97185e Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 bug fix: order of chooser_idx in interaction_simulate commit 60a744a Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 no duplicate arrays commit 710b3b0 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 memory reduction commit 5c506f1 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 np array instead of for loop commit 5604b3e Merge: 6f31c7682f1f7d Author: Jeffrey Newman <jeff@driftless.xyz> Date: Fri Mar 13 08:46:09 2026 -0500 Merge pull request ActivitySim#1042 from driftlesslabs/eet update EET feature branch commit 82f1f7d Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 12 23:01:52 2026 -0500 update larch pin to 6.0.46 commit 0754bb0 Merge: 45ab2cab8297d2 Author: Jeff Newman <jeff@driftless.xyz> Date: Tue Mar 10 14:22:59 2026 -0500 Merge branch 'main' into eet commit 45ab2ca Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 14:02:37 2026 -0500 blacken commit 57ba5bc Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 13:50:26 2026 -0500 fix unbound variable in estimation mode commit 7fe8746 Merge: 0c0f77e6f31c76 Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 5 12:39:08 2026 -0600 Merge branch 'explicit_error_terms_2' # Conflicts: # activitysim/core/configuration/top.py # activitysim/core/interaction_sample.py commit 6f31c76 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 13:11:31 2025 +1000 fix allow_zero_probs for prob calculation in EET interaction_sample commit 3b48a07 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:26:11 2025 +1000 lint commit 66cdac9 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:23:42 2025 +1000 consistently treat utilities that would lead to zero choices in MC simulation commit e102a9e Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 09:17:47 2025 +1000 adds validate utility method to align with unavailable choices in MC simulation commit 94e629a Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 22:10:43 2025 +1000 patch other instance of padded_utility for eet commit 5636cd9 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 21:09:25 2025 +1000 lint commit c40b989 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 20:55:47 2025 +1000 avoid choosing alternatives corresponding to padded utilities in interaction_sample_simulate commit 49fcaa5 Merge: 582c998146c7ff Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 14:51:11 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 582c998 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:52:14 2025 +1000 comment clean up commit 41d49ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:39:59 2025 +1000 clean up comments commit 1f815e8 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:24:21 2025 +1000 remove comment commit ef0be21 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:06:06 2025 +1000 fix nest_spec is None bug commit 2a563ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:39:50 2025 +1000 lint commit 5de1d23 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:29:10 2025 +1000 compute settings in disaggreagte accessibility w/o hack commit 28142cd Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:59:04 2025 +1000 fix bool conversion of None for eet compute settings in sub-components commit fc68697 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:40:31 2025 +1000 fix _interaction_sample return doc commit 3793ec2 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:36:30 2025 +1000 fix no sampling in interaction_sample commit d6ecb0d Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:51:17 2025 +1000 update comments commit 892c3fb Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:39:37 2025 +1000 move interaction sample without sampling out of MC loop to enable for both MC and eet commit 9900f48 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 19:23:41 2025 +1000 lint commit 0fa183e Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 11:15:07 2025 +1000 jtp custom chooser for EET commit 9a0fb66 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 08:32:05 2025 +1000 more comments commit 9d12b08 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 07:55:04 2025 +1000 comments commit 6f8958b Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:54:06 2025 +1000 lint commit 5637fb0 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:41:00 2025 +1000 test SOA MC for disagg access commit 6a0987d Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:31:56 2025 +1000 identifies eet todos commit c6d60c6 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:23:30 2025 +1000 comment clean up commit 5105b17 Merge: 30ddb3ede6d0ef Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 03:38:42 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 30ddb3e Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:44:54 2025 +1000 default compute settings set before, no need to check if none commit 11d86a1 Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:34:05 2025 +1000 Adds subcomponent-specific eet setting commit 0f54cec Author: Jan Zill <jzill@anl.gov> Date: Sun Apr 6 20:07:50 2025 +1000 compute_setting overrides for eet, currently only for interaction_sample to test loc sampling with MC commit f5f365f Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:23:57 2025 +1000 removes notebook folder commit 73b8c32 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:14:44 2025 +1000 sign on logsum commit 14441a6 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 16:26:28 2025 +1000 corr commit e1e9d08 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 15:48:46 2025 +1000 seeding corr test commit 114b747 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 14:37:12 2025 +1000 some variation checks, dev notebooks, to delete commit c6feaef Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 18:17:34 2025 +1000 log eet setting on start up commit 75bb84d Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:56:50 2025 +1000 more merge fixes, example runs through commit 08d013a Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:49:10 2025 +1000 more merge bugs commit 792d183 Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:24:25 2025 +1000 merge bug commit b86093f Merge: 9a17395bf64b7b Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:00:53 2025 +1000 Merge branch 'master' into janzill/utilit_based_choices_2025 commit 9a17395 Merge: 6b0b4e9ae7fa43 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jan 31 15:41:45 2023 +1000 resolves merge conflicts with main v1.2 commit 6b0b4e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 27 11:13:44 2022 +1000 memory logging commit c0d1ca1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 16:04:36 2022 +1000 gumbel by hand by inverse cdf commit 3973bcd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:34:24 2022 +1000 clean up commit 6451abd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:24:33 2022 +1000 use numpy's gumbel to draw from ev1 commit 313bcd0 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 15:16:51 2022 +1000 remove scale and location params from ev1 quartile fct commit 26a7090 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 13:59:47 2022 +1000 interaction sample dev commit d6f4f97 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 07:29:51 2022 +1000 remove comment commit 7df4c8d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:36:17 2022 +1000 to numpy once commit 7a66a67 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:10:00 2022 +1000 set index commit c6d75d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:03:21 2022 +1000 delete after last ref, not before commit 78630be Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:01:39 2022 +1000 spelling commit 2568b72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:00:59 2022 +1000 memory work commit e0555d4 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 22:43:13 2022 +1000 interaction_sample memory saving implementation commit 47601e3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:18:40 2022 +1000 bug fix commit 2ec41b1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:00:53 2022 +1000 mem tracing in interaction_sample commit 4c6a524 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 19:47:07 2022 +1000 custom chooser commit dbc809a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:05:10 2022 +1000 add utility based choice option for transit virtual pathbuilder commit b449593 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:02:29 2022 +1000 bug fix commit f6d81d6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:57:00 2022 +1000 bug fix commit f0143e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:54:36 2022 +1000 remove false comparison commit 7a6cc29 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:38:34 2022 +1000 need probs in interaction_sample - try it the quick way commit 4f825ae Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:22:29 2022 +1000 style fixes commit 417e90f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:17:44 2022 +1000 wrong method in cdap commit f0cc563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:16:05 2022 +1000 interaction_sample util based w/p probs commit cb807d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:35:49 2022 +1000 remove usage of choose_individual_max_utility commit eea84ca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:31:14 2022 +1000 remove usage of choose_individual_max_utility commit 8ac91f1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:28:39 2022 +1000 remove usage of choose_individual_max_utility commit 0387c35 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:27:33 2022 +1000 remove usage of choose_individual_max_utility commit 6b38f12 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:26:48 2022 +1000 remove usage of choose_individual_max_utility commit affe2b6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:21:32 2022 +1000 remove usage of choose_individual_max_utility commit 17792f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:13:49 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit b48dd71 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:09:57 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 4b5cad2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:02:52 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f9b1e2e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 15:59:30 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 043a0bd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:53:12 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f890799 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:36:24 2022 +1000 fake rand tracing commit d14fac3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:34:40 2022 +1000 memory saving work - delete dfs wherever possible commit c26c80c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:58:25 2022 +1000 no fru for probabilitic lookup tables commit 087ec0e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:20:34 2022 +1000 use fru in models that use logit.make_choices w/o simulate wrapper commit 8c16765 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:56:29 2022 +1000 make choice indexing for nested logit consistent with mnl and cumsum MC commit 61a314f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:30:07 2022 +1000 move reporting in make choices commit 19d1222 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:22:54 2022 +1000 remove debug print statement commit 9685aca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:06:50 2022 +1000 make place of call consistent commit 8c1d1ed Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:30:45 2022 +1000 pass arguments in commit 7fbba93 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:03:39 2022 +1000 fies frozen_rand setting call commit bbce6aa Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 13:52:33 2022 +1000 nested index instead of name commit 005b131 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:29:01 2022 +1000 adds interaction_sample at the module level, not individual model commit 00208e7 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:24:49 2022 +1000 adds interaction_sample at the module level, not individual model commit e3e4326 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 09:14:45 2022 +1000 interaction sample frozen rand indiv util commit 64c4e6e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 08:57:18 2022 +1000 fixes alternative index as chosen value commit 36789a3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 18:54:04 2022 +1000 interaction_sample dev work commit 9950f84 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 13:28:45 2022 +1000 interaction_sample dev work commit e65635d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 12:55:01 2022 +1000 interaction sample notebook commit 9ac51c9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 20:22:41 2022 +1000 usage of interaction_sample_simulate commit f3e1610 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:41:11 2022 +1000 add setting to interaction_simulate call commit 1d4ca9a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:39:22 2022 +1000 froxen rand ind util in interaction simulate commit 1a786f2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:33:05 2022 +1000 implement flag in settings, apply to all simple simulate models commit f725ca6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:05:13 2022 +1000 pass through frozen_impl flag commit 0c6f4c8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:03:06 2022 +1000 nested now with alternative numbers, not names, change structure to be more consistent with current impl commit 7694563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 15:48:51 2022 +1000 simple siumlate mnl frozen rand ind util commit 921983f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 10:53:07 2022 +1000 adds more convergence analysis commit 8668383 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 00:26:03 2022 +1000 nicer comparison commit 75c16a2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 21:26:02 2022 +1000 validation commit 3700a9e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 17:43:32 2022 +1000 some validation metrics commit 42901bf Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 16:15:51 2022 +1000 adds goodness of fit test and loop over all trips commit 7bfb80a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 15 22:32:41 2022 +1000 adds comment regarding potential random choice runtime improvement commit e821b57 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 14:12:29 2022 +1000 nest scaling comment commit fba8728 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 13:10:43 2022 +1000 nest scales in asim seem to be all between 0 and 1, so not like in larch where they are non-increasing - re-adjust util calc. should really document this somewhere commit 4d0d823 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 01:10:24 2022 +1000 inspecting a couple of test cases commit 4ee74ea Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:40:11 2022 +1000 clean up commit e02b46a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:35:23 2022 +1000 compare to larch probs commit ebf64c6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 9 17:23:50 2022 +1000 larch notebook to calculate probs a different way commit 7984392 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:45:27 2022 +1000 removes trace in runtime tests commit 6c17d89 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:26:14 2022 +1000 caching nest level names and alternatives commit 9f4d262 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:32:31 2022 +1000 check commit c95f68d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:15:41 2022 +1000 fixes bug in choice for tree commit 1286183 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:57:43 2022 +1000 output clean up commit 932d5ad Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:41:13 2022 +1000 scaling in recursive nest utilities commit 7c21407 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 13:27:26 2022 +1000 adds nested utility scale commit b60702b Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:21:50 2022 +1000 clean up commit 4883c33 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:13:41 2022 +1000 recursive utility calculation fix commit f2cea72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 11:59:01 2022 +1000 two level still off commit fd5ca14 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 21:18:50 2022 +1000 fixes scale of nest utilities commit ab8a212 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:11:42 2022 +1000 probs validation clean up commit a31d97f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:08:14 2022 +1000 probs trip set up commit 5e8bf16 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 12:56:34 2022 +1000 towards validation of probs for single trip commit 5a7ad3c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:41:58 2022 +1000 pull out cruft commit 83a86f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:01:29 2022 +1000 scale of leaf utility commit 5dc1a44 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 22:11:12 2022 +1000 baby steps towards validation commit c6b609a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 21:43:07 2022 +1000 prototype simple_simulate commit a4a7630 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 20:53:30 2022 +1000 adds choice based on walking nest levels commit c973be8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 15:52:43 2022 +1000 prototype work - return leaf and node (exp max) utilities, nest spec commit ec8ae75 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 3 21:10:55 2022 +1000 notebook dev, adds nest coefficient in logit.py Co-authored-by: Jan <jan@outerloop.io> Co-authored-by: Tom Stephen <tom.stephen@icloud.com> Co-authored-by: Tyler Pearn <tyler@outerloop.io>
m-richards added a commit
to m-richards/activitysim
that referenced
this pull request
May 9, 2026
(Squash of ActivitySim#1064 as of fcef6b3) Co-authored-by: Jan <jan@outerloop.io> Co-authored-by: Tom Stephen <tom.stephen@icloud.com> Co-authored-by: Tyler Pearn <tyler@outerloop.io> commit fcef6b3 Merge: 08b2b0310db123 Author: Jan <jan@outerloop.io> Date: Sat Apr 11 19:34:40 2026 +1000 Merge pull request ActivitySim#7 from outerl/deterministic-alt-sample-randoms Deterministic alt sample randoms commit 10db123 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 17:26:45 2026 +1000 doco update commit e9fb130 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 16:31:27 2026 +1000 disable arc sharrow test until regress trips are updated commit d7c1345 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 14:16:20 2026 +1000 trip scheduling comment for EET commit f2d7bfa Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:44:23 2026 +1000 removes outdated comment commit 8d7ae41 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:25:01 2026 +1000 updates arc regress files commit 3bd3251 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:09:51 2026 +1000 no alts_context for trip_scheduling commit 12a3d8a Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:05:01 2026 +1000 Revert "Deterministic randoms when adding/removing tours for trip scheduling choice" This reverts commit 2d181b2. commit 6d29f18 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 13:01:59 2026 +1000 re-instate arc tests commit 834fc90 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 08:56:08 2026 +1000 re-add arc test, remove parking choice column from regress trips commit 19750a0 Author: Jan Zill <jan@outerloop.io> Date: Sat Apr 11 07:15:25 2026 +1000 updates outdated comment commit 531b562 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:44:15 2026 +1000 linting commit bc56a87 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 16:32:14 2026 +1000 PR noise, make sure alts_context built on un-modified alternatives in trip_dest commit 7a22612 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 15:00:25 2026 +1000 Roll back final_trips.csv for production_semcog commit cfe6166 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:47:52 2026 +1000 PR noise commit 2d181b2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 11:30:08 2026 +1000 Deterministic randoms when adding/removing tours for trip scheduling choice commit 47ed600 Author: Tom Stephen <tom.stephen@icloud.com> Date: Fri Apr 10 09:46:03 2026 +1000 Commenting/fix alts context constructions, update semcog test commit 89dbe5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 17:47:30 2026 +1000 Tidy, complete implementation of alts_context, add tests, rebuild regress for multi zone tests commit 0d2356e Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 9 13:46:47 2026 +1000 Copy changes from m-richards:matt/poisson_eet_2026_04 commit 08b2b03 Merge: d5a8fd4c786919 Author: Jan <jan@outerloop.io> Date: Thu Apr 9 09:28:15 2026 +1000 Merge pull request ActivitySim#6 from outerl/explicit_error_terms-multiple_zone_test Adds 2 zone tests commit c786919 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 22:17:33 2026 +1000 progressive 2 zone test commit 7c96cbc Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 20:08:58 2026 +1000 base seed same as non-eet, update regress eet data commit 9661d01 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:17:37 2026 +1000 re-add 3-zone tests commit 5b24d44 Author: Jan Zill <jan@outerloop.io> Date: Tue Apr 7 19:11:51 2026 +1000 add back accidentally removed import commit f5b6301 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:47:25 2026 +1000 Change formatting from using ruff to black commit 033f08a Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Apr 7 12:42:10 2026 +1000 Add eet multiple zone test for zone=2 commit d5a8fd4 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 20:47:48 2026 -0300 no need to restrict to specific choosers for reset, each process has its own state commit d50ad3c Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 16:41:33 2026 +1000 semcog test with different seed for eet mp to work around non-determinism in trip_scheduling (probabilistic, no EET branch) commit 220c5cf Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 10:41:15 2026 +1000 mp rng reset, disabling one new test for no commit 22a4f62 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:59:54 2026 +1000 disable test unitl further investigation commit 7209985 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:41:52 2026 +1000 lint commit be3a270 Author: Jan Zill <jan@outerloop.io> Date: Fri Apr 3 08:35:58 2026 +1000 testing for semcog model, update to shadow pricing reset commit c5bd23f Merge: 5604b3ea7e8529 Author: Jan <jan@outerloop.io> Date: Fri Apr 3 04:28:44 2026 +1000 Merge pull request #3 from outerl/jzill/runtime_improvement Testing, documentation, runtime improvement commit a7e8529 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:52:41 2026 +1000 undo changes in unrelated code to reduce noise commit 7959c94 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:38:03 2026 +1000 clean up doco commit d674268 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:14:39 2026 +1000 memory usage doco commit 837ae41 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 21:03:06 2026 +1000 doco clean up commit 2d1dbcb Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:59:29 2026 +1000 doco re memory commit f542e58 Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 20:53:58 2026 +1000 doco clean up commit 8c74d2a Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:55:08 2026 +1000 docs commit 605366f Author: Jan Zill <jan@outerloop.io> Date: Thu Apr 2 16:38:41 2026 +1000 doc fix commit 1d139e0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 10:10:30 2026 +1000 Fix failing tests commit 0da80bf Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:47:52 2026 +1000 . commit 21daa5c Author: Tom Stephen <tom.stephen@icloud.com> Date: Thu Apr 2 09:44:16 2026 +1000 Revert linting changes commit 40b0b06 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:58:15 2026 +1000 add scale comment commit a0bc5ba Merge: 661c6b3b455e2a Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:54:33 2026 +1000 Merge branch 'jzill/runtime_improvement' of github.com:outerl/activitysim into jzill/runtime_improvement commit 661c6b3 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 21:53:39 2026 +1000 doco part two commit a490999 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 20:34:51 2026 +1000 eet doco start commit b455e2a Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 17:02:02 2026 +1000 Roll back validate_utils commit a73f6ea Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:28:31 2026 +1000 Fix test commit dd54711 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:06:18 2026 +1000 Linting commit 3270474 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 16:01:53 2026 +1000 Shuffle check to logit.py commit c1806fc Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 15:56:31 2026 +1000 Close out remaining TODO-EETs commit cc8fda0 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:19:41 2026 +1000 reset rng only for eet for now. discuss in engineering meeting commit d491e45 Merge: 1aa85ba6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 15:10:05 2026 +1000 Merge branch 'jzill/runtime_improvement' into jzill/reset_rng_on_shadow_pricing commit 6ef25e1 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:40:26 2026 +1000 clean up commit ae71433 Author: Jan Zill <jan@outerloop.io> Date: Tue Mar 31 13:14:09 2026 +1000 lint commit 52f75fa Merge: 4e0c7e8b021cee Author: Jan <jan@outerloop.io> Date: Tue Mar 31 13:10:19 2026 +1000 Merge pull request #5 from outerl/tom/nested-logit-tests-and-docs Extend logit tests, add model tests, add simulate tests, draft docs commit b021cee Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:29:12 2026 +1000 Finish removing nest_spec definition in simulate.py tests commit b62001e Merge: 743c56f4debaad Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:28:20 2026 +1000 Merge with Tom's linting changes commit 743c56f Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 11:20:25 2026 +1000 Move nest_spec to a fixture in simulate.py tests commit 4debaad Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 31 11:17:03 2026 +1000 Linting commit f55b2cd Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 10:59:30 2026 +1000 Add test for compute_nested_utilities. Computes nested utilities on a toy example and compares the result commit 65fd171 Author: Tyler Pearn <tyler@outerloop.io> Date: Tue Mar 31 08:50:37 2026 +1000 Implement Jan's suggestion of how to calculate household ids for testing cdap eet parity commit d0a6429 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 26 20:09:33 2026 +1000 roll back changes to core tests to minimize noise commit 362eef0 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 24 09:37:18 2026 +1000 Linting, minor changes to test_simulate.py commit f628505 Author: Tyler Pearn <tyler@outerloop.io> Date: Mon Mar 23 17:02:46 2026 +1000 Add tests checking that choices made using eet and from probabilities are the same for eval_mnl and eval_nl commit 76cacb2 Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 17:19:37 2026 +1000 Add basic docs for EET commit bd4211f Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 23 16:38:56 2026 +1000 Add tests for logit NL, ordering, and all models using EET commit 1aa85ba Author: Jan Zill <jan@outerloop.io> Date: Sun Mar 22 16:36:23 2026 +1000 reset rng offset on iterate_location_choice (shadow pricing) commit 4e0c7e8 Author: Jan Zill <jan@outerloop.io> Date: Fri Mar 20 14:08:37 2026 +1000 make test clearer commit 1b2b6dc Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 19:55:46 2026 +1000 interaction_sample test to catch index order bug commit fa54204 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:40:37 2026 +1000 numpy not loop commit 1213b56 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:27:35 2026 +1000 reinstate test, up number of draws for comparison commit 5e9847d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:10:02 2026 +1000 series not array commit 1df7d0d Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 16:02:31 2026 +1000 unify mc and eet reporting during choice making commit 6440d3f Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:34:47 2026 +1000 undo stray comment commit 73f45fe Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:29:59 2026 +1000 reshape, do not flatten for potential performance commit cf92aad Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:44:41 2026 +1000 Normalise number of choosers, alternatives and minimum tolerance for EET comparison tests commit df574ee Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:35:29 2026 +1000 Linting commit a7f2e8f Author: Tom Stephen <tom.stephen@icloud.com> Date: Wed Mar 18 14:30:02 2026 +1000 Fix, complete tests for interaction sample, simulate commit a9db131 Author: Tom Stephen <tom.stephen@icloud.com> Date: Tue Mar 17 12:04:56 2026 +1000 Add basic with/without EET test for interaction simulate commit 9d69dab Author: Tom Stephen <tom.stephen@icloud.com> Date: Mon Mar 16 17:15:28 2026 +1000 add tests, docstrings for logit commit f97185e Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 bug fix: order of chooser_idx in interaction_simulate commit 60a744a Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 no duplicate arrays commit 710b3b0 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 memory reduction commit 5c506f1 Author: Jan Zill <jan@outerloop.io> Date: Thu Mar 19 15:21:26 2026 +1000 np array instead of for loop commit 5604b3e Merge: 6f31c7682f1f7d Author: Jeffrey Newman <jeff@driftless.xyz> Date: Fri Mar 13 08:46:09 2026 -0500 Merge pull request ActivitySim#1042 from driftlesslabs/eet update EET feature branch commit 82f1f7d Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 12 23:01:52 2026 -0500 update larch pin to 6.0.46 commit 0754bb0 Merge: 45ab2cab8297d2 Author: Jeff Newman <jeff@driftless.xyz> Date: Tue Mar 10 14:22:59 2026 -0500 Merge branch 'main' into eet commit 45ab2ca Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 14:02:37 2026 -0500 blacken commit 57ba5bc Author: Jeff Newman <jeff@driftless.xyz> Date: Mon Mar 9 13:50:26 2026 -0500 fix unbound variable in estimation mode commit 7fe8746 Merge: 0c0f77e6f31c76 Author: Jeff Newman <jeff@driftless.xyz> Date: Thu Mar 5 12:39:08 2026 -0600 Merge branch 'explicit_error_terms_2' # Conflicts: # activitysim/core/configuration/top.py # activitysim/core/interaction_sample.py commit 6f31c76 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 13:11:31 2025 +1000 fix allow_zero_probs for prob calculation in EET interaction_sample commit 3b48a07 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:26:11 2025 +1000 lint commit 66cdac9 Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 10:23:42 2025 +1000 consistently treat utilities that would lead to zero choices in MC simulation commit e102a9e Author: Jan Zill <jzill@anl.gov> Date: Fri May 30 09:17:47 2025 +1000 adds validate utility method to align with unavailable choices in MC simulation commit 94e629a Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 22:10:43 2025 +1000 patch other instance of padded_utility for eet commit 5636cd9 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 21:09:25 2025 +1000 lint commit c40b989 Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 20:55:47 2025 +1000 avoid choosing alternatives corresponding to padded utilities in interaction_sample_simulate commit 49fcaa5 Merge: 582c998146c7ff Author: Jan Zill <jzill@anl.gov> Date: Thu May 29 14:51:11 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 582c998 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:52:14 2025 +1000 comment clean up commit 41d49ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:39:59 2025 +1000 clean up comments commit 1f815e8 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:24:21 2025 +1000 remove comment commit ef0be21 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 10:06:06 2025 +1000 fix nest_spec is None bug commit 2a563ff Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:39:50 2025 +1000 lint commit 5de1d23 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 08:29:10 2025 +1000 compute settings in disaggreagte accessibility w/o hack commit 28142cd Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:59:04 2025 +1000 fix bool conversion of None for eet compute settings in sub-components commit fc68697 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:40:31 2025 +1000 fix _interaction_sample return doc commit 3793ec2 Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 07:36:30 2025 +1000 fix no sampling in interaction_sample commit d6ecb0d Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:51:17 2025 +1000 update comments commit 892c3fb Author: Jan Zill <jzill@anl.gov> Date: Mon May 26 06:39:37 2025 +1000 move interaction sample without sampling out of MC loop to enable for both MC and eet commit 9900f48 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 19:23:41 2025 +1000 lint commit 0fa183e Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 11:15:07 2025 +1000 jtp custom chooser for EET commit 9a0fb66 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 08:32:05 2025 +1000 more comments commit 9d12b08 Author: Jan Zill <jzill@anl.gov> Date: Sun May 25 07:55:04 2025 +1000 comments commit 6f8958b Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:54:06 2025 +1000 lint commit 5637fb0 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:41:00 2025 +1000 test SOA MC for disagg access commit 6a0987d Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:31:56 2025 +1000 identifies eet todos commit c6d60c6 Author: Jan Zill <jzill@anl.gov> Date: Sat Apr 12 05:23:30 2025 +1000 comment clean up commit 5105b17 Merge: 30ddb3ede6d0ef Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 03:38:42 2025 +1000 Merge remote-tracking branch 'origin/master' into janzill/utilit_based_choices_2025 commit 30ddb3e Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:44:54 2025 +1000 default compute settings set before, no need to check if none commit 11d86a1 Author: Jan Zill <jzill@anl.gov> Date: Mon Apr 7 02:34:05 2025 +1000 Adds subcomponent-specific eet setting commit 0f54cec Author: Jan Zill <jzill@anl.gov> Date: Sun Apr 6 20:07:50 2025 +1000 compute_setting overrides for eet, currently only for interaction_sample to test loc sampling with MC commit f5f365f Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:23:57 2025 +1000 removes notebook folder commit 73b8c32 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 20:14:44 2025 +1000 sign on logsum commit 14441a6 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 16:26:28 2025 +1000 corr commit e1e9d08 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 15:48:46 2025 +1000 seeding corr test commit 114b747 Author: Jan Zill <jzill@anl.gov> Date: Wed Apr 2 14:37:12 2025 +1000 some variation checks, dev notebooks, to delete commit c6feaef Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 18:17:34 2025 +1000 log eet setting on start up commit 75bb84d Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:56:50 2025 +1000 more merge fixes, example runs through commit 08d013a Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:49:10 2025 +1000 more merge bugs commit 792d183 Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:24:25 2025 +1000 merge bug commit b86093f Merge: 9a17395bf64b7b Author: Jan Zill <jzill@anl.gov> Date: Sat Mar 29 17:00:53 2025 +1000 Merge branch 'master' into janzill/utilit_based_choices_2025 commit 9a17395 Merge: 6b0b4e9ae7fa43 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jan 31 15:41:45 2023 +1000 resolves merge conflicts with main v1.2 commit 6b0b4e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 27 11:13:44 2022 +1000 memory logging commit c0d1ca1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 16:04:36 2022 +1000 gumbel by hand by inverse cdf commit 3973bcd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:34:24 2022 +1000 clean up commit 6451abd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 24 10:24:33 2022 +1000 use numpy's gumbel to draw from ev1 commit 313bcd0 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 15:16:51 2022 +1000 remove scale and location params from ev1 quartile fct commit 26a7090 Author: janzill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 13:59:47 2022 +1000 interaction sample dev commit d6f4f97 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue Jun 21 07:29:51 2022 +1000 remove comment commit 7df4c8d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:36:17 2022 +1000 to numpy once commit 7a66a67 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:10:00 2022 +1000 set index commit c6d75d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:03:21 2022 +1000 delete after last ref, not before commit 78630be Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:01:39 2022 +1000 spelling commit 2568b72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 23:00:59 2022 +1000 memory work commit e0555d4 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 22:43:13 2022 +1000 interaction_sample memory saving implementation commit 47601e3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:18:40 2022 +1000 bug fix commit 2ec41b1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 20:00:53 2022 +1000 mem tracing in interaction_sample commit 4c6a524 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 19:47:07 2022 +1000 custom chooser commit dbc809a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:05:10 2022 +1000 add utility based choice option for transit virtual pathbuilder commit b449593 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 18:02:29 2022 +1000 bug fix commit f6d81d6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:57:00 2022 +1000 bug fix commit f0143e9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:54:36 2022 +1000 remove false comparison commit 7a6cc29 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:38:34 2022 +1000 need probs in interaction_sample - try it the quick way commit 4f825ae Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:22:29 2022 +1000 style fixes commit 417e90f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:17:44 2022 +1000 wrong method in cdap commit f0cc563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 17:16:05 2022 +1000 interaction_sample util based w/p probs commit cb807d1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:35:49 2022 +1000 remove usage of choose_individual_max_utility commit eea84ca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:31:14 2022 +1000 remove usage of choose_individual_max_utility commit 8ac91f1 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:28:39 2022 +1000 remove usage of choose_individual_max_utility commit 0387c35 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:27:33 2022 +1000 remove usage of choose_individual_max_utility commit 6b38f12 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:26:48 2022 +1000 remove usage of choose_individual_max_utility commit affe2b6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:21:32 2022 +1000 remove usage of choose_individual_max_utility commit 17792f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:13:49 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit b48dd71 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:09:57 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 4b5cad2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 16:02:52 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f9b1e2e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 15:59:30 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit 043a0bd Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:53:12 2022 +1000 working through all make_choices calls to implement memory saving hack until sharrow arrives commit f890799 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:36:24 2022 +1000 fake rand tracing commit d14fac3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon Jun 20 14:34:40 2022 +1000 memory saving work - delete dfs wherever possible commit c26c80c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:58:25 2022 +1000 no fru for probabilitic lookup tables commit 087ec0e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 16:20:34 2022 +1000 use fru in models that use logit.make_choices w/o simulate wrapper commit 8c16765 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:56:29 2022 +1000 make choice indexing for nested logit consistent with mnl and cumsum MC commit 61a314f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:30:07 2022 +1000 move reporting in make choices commit 19d1222 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:22:54 2022 +1000 remove debug print statement commit 9685aca Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 15:06:50 2022 +1000 make place of call consistent commit 8c1d1ed Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:30:45 2022 +1000 pass arguments in commit 7fbba93 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 14:03:39 2022 +1000 fies frozen_rand setting call commit bbce6aa Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun Jun 19 13:52:33 2022 +1000 nested index instead of name commit 005b131 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:29:01 2022 +1000 adds interaction_sample at the module level, not individual model commit 00208e7 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 10:24:49 2022 +1000 adds interaction_sample at the module level, not individual model commit e3e4326 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 09:14:45 2022 +1000 interaction sample frozen rand indiv util commit 64c4e6e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri Jun 17 08:57:18 2022 +1000 fixes alternative index as chosen value commit 36789a3 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 18:54:04 2022 +1000 interaction_sample dev work commit 9950f84 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 13:28:45 2022 +1000 interaction_sample dev work commit e65635d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu Jun 16 12:55:01 2022 +1000 interaction sample notebook commit 9ac51c9 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 20:22:41 2022 +1000 usage of interaction_sample_simulate commit f3e1610 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:41:11 2022 +1000 add setting to interaction_simulate call commit 1d4ca9a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:39:22 2022 +1000 froxen rand ind util in interaction simulate commit 1a786f2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:33:05 2022 +1000 implement flag in settings, apply to all simple simulate models commit f725ca6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:05:13 2022 +1000 pass through frozen_impl flag commit 0c6f4c8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 19:03:06 2022 +1000 nested now with alternative numbers, not names, change structure to be more consistent with current impl commit 7694563 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed Jun 15 15:48:51 2022 +1000 simple siumlate mnl frozen rand ind util commit 921983f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 10:53:07 2022 +1000 adds more convergence analysis commit 8668383 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 17 00:26:03 2022 +1000 nicer comparison commit 75c16a2 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 21:26:02 2022 +1000 validation commit 3700a9e Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 17:43:32 2022 +1000 some validation metrics commit 42901bf Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 16 16:15:51 2022 +1000 adds goodness of fit test and loop over all trips commit 7bfb80a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 15 22:32:41 2022 +1000 adds comment regarding potential random choice runtime improvement commit e821b57 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 14:12:29 2022 +1000 nest scaling comment commit fba8728 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 13:10:43 2022 +1000 nest scales in asim seem to be all between 0 and 1, so not like in larch where they are non-increasing - re-adjust util calc. should really document this somewhere commit 4d0d823 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 01:10:24 2022 +1000 inspecting a couple of test cases commit 4ee74ea Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:40:11 2022 +1000 clean up commit e02b46a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 10 00:35:23 2022 +1000 compare to larch probs commit ebf64c6 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Mon May 9 17:23:50 2022 +1000 larch notebook to calculate probs a different way commit 7984392 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:45:27 2022 +1000 removes trace in runtime tests commit 6c17d89 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 22:26:14 2022 +1000 caching nest level names and alternatives commit 9f4d262 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:32:31 2022 +1000 check commit c95f68d Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Sun May 8 21:15:41 2022 +1000 fixes bug in choice for tree commit 1286183 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:57:43 2022 +1000 output clean up commit 932d5ad Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 16:41:13 2022 +1000 scaling in recursive nest utilities commit 7c21407 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 13:27:26 2022 +1000 adds nested utility scale commit b60702b Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:21:50 2022 +1000 clean up commit 4883c33 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 12:13:41 2022 +1000 recursive utility calculation fix commit f2cea72 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Fri May 6 11:59:01 2022 +1000 two level still off commit fd5ca14 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 21:18:50 2022 +1000 fixes scale of nest utilities commit ab8a212 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:11:42 2022 +1000 probs validation clean up commit a31d97f Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 14:08:14 2022 +1000 probs trip set up commit 5e8bf16 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Thu May 5 12:56:34 2022 +1000 towards validation of probs for single trip commit 5a7ad3c Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:41:58 2022 +1000 pull out cruft commit 83a86f5 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 23:01:29 2022 +1000 scale of leaf utility commit 5dc1a44 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 22:11:12 2022 +1000 baby steps towards validation commit c6b609a Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 21:43:07 2022 +1000 prototype simple_simulate commit a4a7630 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 20:53:30 2022 +1000 adds choice based on walking nest levels commit c973be8 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Wed May 4 15:52:43 2022 +1000 prototype work - return leaf and node (exp max) utilities, nest spec commit ec8ae75 Author: Jan Zill <jan.zill@veitchlister.com.au> Date: Tue May 3 21:10:55 2022 +1000 notebook dev, adds nest coefficient in logit.py Co-authored-by: Jan <jan@outerloop.io> Co-authored-by: Tom Stephen <tom.stephen@icloud.com> Co-authored-by: Tyler Pearn <tyler@outerloop.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We anticipate needing to read OMX files at some point, though it's not required for our first model of automobile ownership. This PR adds an
activitysim.omxmodel based on the OMX code at https://github.com/osPlanning/omx.