forked from ActivitySim/activitysim
-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RSG Phase 7 Enhancements #47
Merged
Merged
Conversation
This file contains 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
School escorting
Flexible ids for merge
* 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>
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.