update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

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

update EET feature branch - #1042

Merged
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet
Mar 13, 2026
Merged

update EET feature branch#1042
jpn-- merged 43 commits into
ActivitySim:explicit_error_termsfrom
driftlesslabs:eet

Conversation

@jpn--

Copy link
Copy Markdown
Member

The PR updates the feature branch to stay mostly in-sync with development on the main branch.

jpn--and others added 30 commits May 31, 2025 17:30
* Fix typos in summarize docstring
* Fix log message in util.delete_files
* Fix docstring for VehicleAllocationSettings
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
* first uv sync
* explicitly set np.int64 dtype before calling pd set_index()
Pandas 2 got rid of the `Int64Index` class, it was downcasting to int32 for the input land use table
* Add all dependencies from Conda environments
Consider removing unused ones at a later time
* Remove orca
This dependency was replaced with “state” for workflow orchestration.
* Update release instructions for `uv`
* Remove `--no-default-groups` from `uv sync` instructions
* Trial updating Github Action to uv instead of conda
* Bug fixes
* Try downgrading sharrow
* change core test to windows runner
* use win for all core tests
* index type mismatch
* formatting
* unlock sharrow to 2.14
* correct a typo
* Update Model Setup page in user guide
* Update Ways to Run the Model page
* Remove duplicates
* Simplify pyproject.toml for github action and use only this group
* Update remainder of user guide docs
* Update dev guide [makedocs]
* Update lockfile from changes to dependencies
* Remove conda from other github actions
* Debug doc building [makedocs]
* Update install instructions [makedocs]
* update installation instructions [makedocs]
* notes on uv options [makedocs]
* address review comment
---------
Co-authored-by: Josie Kressner <josiekressner@gmail.com>
* identify and flag naming conflicts in 2d vs 3d skims
* add skims doc
* run on workflow_dispatch
* add link to docs
* write error message in exception also
* add error message example
* code block formatting
* unit tests
* update cat columns in df when new cat exists
* blacken
* sort two categoricals before union
* minor fixes for SimOR development
* blacken
* Using PNUM if available in JTFC
Required to maintain backwards compatibility in tour indexes in SANDAG models
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…activitysim version to logfile (ActivitySim#963)
* adding activitysim version to log file
* fix duplicate columns in parking location choice as described in ActivitySim#633
* making tour mode choice logsum optional in destionation choice models ActivitySim#847
* logsum settings in location choice, trip dest, tour_od
* optional logsums in trip destination
* blacken
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
…m#950)
* feat: adds initial setting_checker module to abm/models
* chore: add .vscode settings to gitignore
* feat: adds first test case for prepopulating settings pydantic model (accessibility)
* feat: adds initial spec checker - wip
* feat: update settings checker to load spec and evaluate coefficients. add second model to validate
* fix: adds missing arg to eval_coefficients
* feat: adds atworksubtour_frequency to settings checker
* feat: moves loading spec and coefficients to independent functions
* refactor: renames main settings checker function. moves loading model settings to independent function
* refactor: moves load, spec, and coef eval checks to an independent function called from main checker. run formatter
* feat: adds load SPEC check for preprocessor settings
* chore: run formatter
* feat: initial checking for model setting with nested coefficients
* feat: adds additional model settings. force try_load_spec to return an empty dataframe, even if no top level spec exists
* feat: adds additional model settings to check. adds special handler for disaggregate accessibility (needs more testing)
* feat: adds settings check for initalize_landuse
* refactor: reorders checking for joint tour composition settings
* feat: adds setting check for joint tour destination
* feat: adds settings check for joint tour frequency composition
* feat: adds settings check for joint tour frequency
* feat: adds settings check for joint tour participation
* feat: adds setting check for joint tour scheduling
* feat: adds settings checks for workplace location and school location
* feat: adds setting check for mandatory tour frequency
* feat: adds settings check for non mandatory tour destination
* feat: adds settings check for parking location choice
* feat: adds settings check for school escorting
* wip: adds stop_frequencies to components dict, but requires a separate flow for nested specs
* feat: adds setting checks for summarize
* feat: adds settings check for telecommute frequency
* feat: adds setting check for tour mode choice
* feat: adds setting check for tour od choice
* feat: adds setting check for tour scheduling probabilistic
* feat: adds setting check for transit pass ownership
* feat: adds setting check for transit pass subsidy
* feat: adds settings check for trip departure choice
* feat: adds setting check for trip destination
* feat: adds setting check for write trip matrices
* feat: adds setting check for trip mode choice
* feat: adds settings checks for trip purpose and destination
* feat: adds setting check for trip purpose
* feat: adds setting check for vehicle allocation
* feat: adds setting check for vehicle type choice
* feat: adds setting check for work from home
* docs: remove one comment
* refactor: removes spurious debug point around cdap spec load
* refactor: refactors setting checking to separate read/evaluate. checks now return result of tuple (Dataframe, Exception | None) for collection of errors.
* feat: adds setting check for intialize households
* feat: adds setting check for mandatory and non-mandatory tour scheduling
* feat: adds partial setting check for non-mandatory tour frequency (not fully implemented due to NESTED_SPEC)
* refactor: raise RunTimeError instead of custom
* feat: adds module-specific file handler to logging
* docs: remove one comment
* refactor: add more specific return type
* refactor: renames try_load_and_check to try_load_and_check_spec_coefs and directly injects model settings, separing check for reading settings yaml files. useful for checking nested model settings
* feat: adds initial handling for SPEC_NEST configs. includes some prequisite refactors to error collection
* refactor: fix logging
* docs: update one comment
* refactor: remove commented raise statements used for debugging
* chore: run black formatter
* refactor: only ever evaluate spec/coef if both are available
* chore: better logging in model settings load
* feat: make setting checker optional
* feat: adds setting check for input checker
* feat: adds setting check for shadow pricing yaml
* chore: remove some outdated comments
* feat: adds setting checks for intialize los
* refactor: changes return type from empty df -> None when spec/coefs are unavaialable
* feat: adds logic for checking settings with templated coefficients
* chore: run formatter
* chore: fix alphabetization of components registry
* feat: check settings for write_data_dictionary
* feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against main model spec
* feat: allow for arbitrary loading of spec files from any subsettings in model settings
* feat: allow custom checks for unusual spec/coefficient pairs
* feat: adds custom SettingCheckerError exception for improved logging
* refactor: better checks and warnings when SPEC or COEFFICENT fields are
missing values.
because the fields in the settings classes are inherited, it is not
usually possible for the settings checker to determine if a path to an
external file is actually required for a particular model component.
the workaround is to issue a specific warning that a path *may* be
expected and users should check the YAML file.
the ultimate solution would be to define more robust Pydantic data
models that ensure that fields are marked as required when appropriate.
* chore: fix spelling.
* refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feeds to checker entrypoint as argument.
* refactor: single entry for settings checker. import extension check settings as dict.
* chore: run black formatter
* refactor: remove commented code
* fix: skip errors for write_data_dictionary if optional yaml file is not loadable
* chore: run black formatter
* fix(tests): remove unused COEFFICIENTS from MWCOG test model
* fix(tests): re-add deleted test_mtc.py test script
* fix: make model registry for checking a copy
* fix(test): remove unused general SPEC in non_mandatory_tour_scheduling.yaml from MWCOG example model
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
…Sim#977)
* Expression profiling (legacy mode) (ActivitySim#936)
* expression profiling
* two reports
* make simple report sortable
* change default to grid
* configurable expression_profile_cutoff
* works with MP
* documentation
* expression_profile_style
* performance_log can be bool
* fix for pandas 2
* test expr profiling
* test expression profiling on mtc and semcog examples
* set encoding to utf8 because windows
* add missing import
* add warning about path length in error message
* oops, .log not .csv
* add timestamping to expression profile logs
* fix file naming, update tests
* all subprocesses to same timestamp
* add note in docs about runtime cost
* manual rebuild of docs
* add permissions
* add explicit telecommute model
* Update explicit_telecommute.py
* Revert "Update explicit_telecommute.py"
This reverts commit 54bc4cc.
* get work and home zone variable from workplace location model
* run explicit telecommute before cdap
* set workplace zone to -1 for person who is telecommuting
* keep workplace location unchanged
* format code with Black
* documentation
* change the model name to telecommute status
* update doc
* update doc
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update docs/dev-guide/components/telecommute_status.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* alphabetical order
* address review comments
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* initial batch of models with pre and post processing added
* nonmand sched and transit pass models
* first pass at preprocessing and annotate functionality in all models
* fixing bugs in jtf and trip purpose
* adding persons back in to locals_d in jtc
* model name missing in tour scheduling
* missing expressions import in tour sched prob
* ci unit tests & fixing estimation test error
* addressing review comments
* fixing typo in location alts preprocessor names
---------
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.1 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.5.1...v1.13.0)
---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
dependency-version: 1.13.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix branch on sandag external test
* locked
* group not only-group
* test in dir
* rootdir for pytest
* test pointer
* move uv
* one layer off
* multiprocess initial commit
* blacken
* parquet format for EDBs
* adding pkl, fixing edb concat and write
* fixing double naming of coefficient files
* blacken
* fixing missing cdap coefficients file, write pickle function
* combact edb writing, index duplication, parquet datatypes
* sorting dest choice bundles
* adding coalesce edbs as its own step
* CI testing initial commit
* infer.py CI testing
* estimation sampling for non-mandatory and joint tours
* adding survey choice to choices_df in interaction_sample
* adding option to delete the mp edb subdirs
* changes supporting sandag abm3 estimation mode
* running test sandag example through trip dest sample
* Estimation Pydantic (#2)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* repair for Pydantic
* df is attribute
* Estimation settings pydantic update
* new compact formatting
* handling multiple columns for parquet write
* dropping duplicate columns
* actually removing duplicate columns
* dfs with correct indexes and correct mp sorting
* ignore index on sort for mp coalesce edbs
* updating estimation checks to allow for non-zero household_sample_size
* Re-estimation (#3)
* pydantic for estimation settings
* allow df as type in config
* fix table_info
* auto ownership
* repair for pydantic
* update for ruff
* updated for simple models
* repair for Pydantic
* simple simulate and location choice
* df is attribute
* scheduling
* stop freq
* test locations
* cdap
* nonmand_and_joint_tour_dest_choice
* nonmand_tour_freq
* fix ci to stop using mamba
* test updates
* use larch6 from pip
* use numba for stop freq
* fix for pandas 1.5
* fix stop freq test for numba
* Sharrow Cache Dir Setting (ActivitySim#893)
* setting necessary filesystem changes from settings file
* set for multiprocessing
* repair github actions
* github action updates (ActivitySim#903)
* script to make data
* unified script for making data
* remove older
* bug
* doc note
* load from parquet if available
* add original alt ids to EDB output when using compact
* fix MP race
* script arg to skip to EDB
* clean up CDAP and blacken
* refactor model_estimation_table_types
change to estimation_table_types, to avoid pydantic namespace clash
* repair drop_dupes
* blacken
* location choice with compact
* choice_def for compact
* spec changes for simple-simulate
* re-estimation demo for auto ownership
* clean up status messages
* change name to stop pydantic warnings
* edit configs
* default estimation sample size is same as regular sample size
* allow location alts not in cv format
* dummy zones for location choice
* update scheduling model estimation
* various cleanup
* stop freq
* tidy build script
* update 02 school location for larger example
* update notebook 04
* editable model re-estimation for location choice
* fix test names
* update notebooks
* cdap print filenames as loading
* notebook 07
* tests thru 07
* notebooks 08 09
* build the data first
* runnable script
* change larch version dependency
* keep pandas<2
* notebooks 10 11
* notebook 12
* remove odd print
* add matplotlib
* notebook 13 14
* test all the notebooks
* add xlsxwriter to tests
* notebook 15
* CDAP revise model spec demo
* notebook 16
* notebook 17
* longer timeout
* notebook 18
* notebook 19
* notebook 20
* smaller notebook 15
* configurable est mode setup
* notebook 21
* notebook 22
* config sample size in GA
* notebook 23
* updates for larch and graphviz
* change default to compact
* compare model 03
* test updates
* rename test targets
* repair_av_zq
* move doctor up
* add another repair
* oops
---------
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
* Removing estimation.yaml settings that are no longer needed
* fixing unit tests, setting parquet edb default
* one more missed estimation.yaml
* using df.items for pandas 2 compatibility
* tidy doc
* updating edb file name for NMTF
* updating numba and pandas in the conda env files
* Improve test stability (#4)
* handle dev versions of Larch
* test stability
* pin multimethod < 2.0
* add availability_expression
* starting est docs
* Resolve package version conflicts (ActivitySim#923)
* limit multimethod version to 2.0 and earlier
* add multimethod version to other settings
* [makedocs] update installer download link
* [makedocs] update branch docs
* GitHub Actions updates (ActivitySim#926)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* trace proto tables if available, otherwise synthetic population (ActivitySim#901)
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* release instructions (ActivitySim#927)
* use libmamba solver
* add permissions [makedocs]
* add write permission for dev docs [makedocs]
* conda-solver: classic
* include workflow dispatch option for tests
* update release instructions
* add installer build to instructions
* Pin mamba for now, per conda-incubator/setup-miniconda#392
* conda-remove-defaults
* when no unavailability parameters are included
* some general estimation docs
* Use pandas 2 for docbuild environment (ActivitySim#928)
* fix link
* allow failure to import larch
* workflow
* blacken
* try some pins
* speed up docbuild
* use pandas 2 for docs
* oops wrong file
* restore foundation
* Update HOW_TO_RELEASE.md
* refactor(shadow_pricing.py): remove a duplicated `default_segment_to_name_dict` (ActivitySim#930)
* fix typo
* fixing disaggregate accessibility bug in zone sampler
* Revert "fixing disaggregate accessibility bug in zone sampler"
This reverts commit be5d093.
* notes on size terms
* clean up docbuild
* fix version check
* add some doc
* tidy
* estimation docs
* more on alternative avail
* model evaluation
* add doc on component_model
* documentation enhancements
* larch6 is now larch>6
* branch docs on workflow_dispatch
* missing doc section on model respec
---------
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: David Hensle <51132108+dhensle@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
* handling missing data or availability conditions
* add docs on locking size terms
* include constants in CDAP
* bump larch requirement
* require larch 6.0.40
* add xlsxwriter to envs
* require larch 6.0.41
* add links
* fix typos and formatting
* cdap hh and per parquet read match csv
* add missing x_validator for mode choice and nonmand tour freq
* add tour mode choice edit example
* add to docs
* union not addition on sets
* restore nb kernel
* blacken
* replacing conda with uv in estimation tests
* add requests to github-action dependencies
* running with created virtual env instead
* Fix estimation notebook tests (ActivitySim#8)
* Update scheduling.py
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
Co-authored-by: Yue Shuai <48269801+yueshuaing@users.noreply.github.com>
Co-authored-by: amarin <17020181+asiripanich@users.noreply.github.com>
Co-authored-by: Ali Etezady <58451076+aletzdy@users.noreply.github.com>
Co-authored-by: Sijia Wang <wangsijia0628@gmail.com>
…ctivitySim#979)
* Initial plan
* Wrap mem.consolidate_logs in try-except to prevent model run crashes
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Initial plan
* Add CITATION.cff file for academic referencing
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Change copyright holder in LICENSE file
Updated copyright holder from Association of Metropolitan Planning Organizations Research Foundation to Zephyr Foundation.
* Update README to remove status badges
Removed Build and Coverage Status badges from README, and add link to Zephyr page.
* Update CITATION.cff per review feedback
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* update uv lock file
* strip github-action group, only use dev
* update coveralls
* update uv lock to larch 6.0.42
* begin to remove placeholder_sandag example
* fix for num_choosers < chunk_size
* update assert logic
* Downgraded logging of which expression is being evaluated from "info" level to "debug" level
* Downgraded column list before and after dropping unused columns from "INFO" to "DEBUG"
* Downgraded reporting of model component results from "INFO" to "DEBUG"
* Downgraded a few log messages in settings checker from "INFO" to "DEBUG"
* Changed default value of `level` argument in flow.TimeLogger.summary() from 20 to 10 so that it's a DEBUG message by default
* Downgraded logging statements when merging the choosers and alternatives from "INFO" to "DEBUG"
* Downgraded runtimes for flow evaluations from "INFO" to "DEBUG"
* Downgraded "sharrow_enabled is True/False" from "INFO" to "DEBUG" as it's repetitive and will likely only be of concern during development/debugging
* Downgraded utility data types reporting from "INFO" to "DEBUG"
* Downgraded all instances of logger.info to logger.debug in activitysim.core.chunk
* Downgraded line reporting how many rows are being run for eval_interaction_utilities
* Downgraded several (primarily repetitive) statements in activitysim.abm.models.util
* Downgraded messages reportng how long each of the sampling, logsums, and simulation in trip destination choice from "INFO" to "DEBUG"
* Downgraded more detailed messages from "INFO" to "DEBUG" in trip destination
* Reclassified some logging statements
* Swapped logging statement classifications to get desired statement printed
* Downgraded statement from "INFO" to "DEBUG" that wasn't providing much information
* blacken
* Added documentation on logging levels
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Added new exceptions based on RuntimeError inventory results
* Changed RuntimeErrors in abm\models
* Corrected name of SystemConfigurationError
* Updated RuntimeErrors in abm\tables
* Added SubprocessError
* Updated RuntimeErrors in core directory
* Renamed `TableSliceError` to `TableSlicingError`
* Classified RuntimeErrors in input and settings checkers as ModelConfigurationErrors
* Created `SegmentedSpecificationError` for when there's an issue with a spec table that's created for a specific segment
* Added TableIndexError
* Classified RuntimeError in initialize_tours as InputPopulationError
* Created EstimationDataError
* Improved clarity of a couple error messages
* Blacken code
* Updated code to reflect older version of Black (22.12.0)
* Updated error messages to look for in activitysim.core tests
* Updated error to look for in abm.text
* Changed SystemConfigurationError to TableSlicingError in test
* Reclasified error when a step is run more than once from TableSlicingError to DuplicateWorkflowNameError
* Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input
---------
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…m#1011)
* Initial plan
* Replace deprecated pkg_resources with importlib.resources
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* Expand UV installation and usage instructions
* disable auto upgrade
* Update modelsetup.rst
* address comments
…ations (ActivitySim#1012)
* Update front page of docs [makedocs]
* formating [makedocs]
* re-format [makedocs]
* clean up [makedocs]
* clarify language [makedocs]
* add oregon
* descriptive error
* allow partial success in setting up skims
- if there is no time period we should still be able to get time-agnostic values
* comments for better context on why
* require sharrow 2.15
* update lock file
* blacken
* update docstring
* address whitespace
…imation mode in joint tour participation (ActivitySim#1008)
* fix(jtp): Correct the participant_num assignment logic for estimation mode in joint tour participation
* fix(jtf): Handle missing PNUM column by selecting the first person in the household
* style: blacken
)
* Demoted multiple repetitive logging messages in core.flow from "INFO" to "DEBUG"
* Downgraded repetitive logging message in skim dataset
dhensleand others added 12 commits December 2, 2025 17:22
…ss (ActivitySim#1005)
* single process run with
* ensured schedule order when generating alternatives
* trip scheduling choice test fix
* scheduling choice fix with linting
* trip departture choice test fix
* deleted extra outputs folder
* restoring deleted arc test files
* deleting extra added files
* more file cleanup
* removing arc from CI test list
* improved testing (ActivitySim#10)
* improved testing
* blacken
* stable sorting
* blacken
* addressing review comments
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
* Implemented hacky attempt at getting subprocesses to have the same run_id as the whole model run
* Reverted previous commit
* Moved generation of Run ID to cli/run.py, initialized states with None for RunID, and set the RunID after the state is initialized
* pass run_id to subprocesses
* Added CI testing for trace ID hashes
* Added test_trace_id.py to list of CI tests to run
* Renamed trace ID test so that it will actually run
* blacken
* blacken 'test' directory
---------
Co-authored-by: Jeff Newman <jeff@driftless.xyz>
* fix error in CDAP estimation model construction
* update tests for CDAP
* fix the other test file
* add to changes.md
* note on possible fixes
…ySim#1018)
* "alt" now used as index in all alternatives modules
* formatting
* minor commenting
* using stable sorting for unit test
* adding to change log
* updating school escort bundle Alt to alt
* typo
* Revert "updating school escort bundle Alt to alt"
This reverts commit 625f685.
* regenerate pipeline
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>
…work/school location choice (ActivitySim#1028)
* addresses issue with zones reopening after being closed in shadow_pricing
* addresses issue with zones reopening after being closed in shadow_pricing
* adding shadow price regression values
* updating change log
---------
Co-authored-by: juangacosta <juan.acosta@rsginc.com>
…ctivitySim#1034)
* Initial plan
* Fix currentmodule directive in work_location_choice.md and school_location_choice.md
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpn-- <1036626+jpn--@users.noreply.github.com>
* sharrow cache clear script
* prevent multithreading unless --fast
* log environment variables
# Conflicts:
#	activitysim/core/configuration/top.py
#	activitysim/core/interaction_sample.py
@janzill

Copy link
Copy Markdown
Contributor

this looks good to me, thanks for the quick fix @jpn--

@jpn--
jpn-- merged commit 5604b3e into ActivitySim:explicit_error_termsMar 13, 2026
19 checks passed
m-richards added a commit to m-richards/activitysim that referenced this pull request May 5, 2026
VLC work is based on ActivitySim#1029 which fed through notional support for EET
in estimation mode. This was disabled in ActivitySim#1042, which
changed the return type requirements.
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>
alice-lian pushed a commit to VictoriaTransport/activitysim that referenced this pull request Jun 10, 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 #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 #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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@jpn--@janzill@dkyleward@dhensle@i-am-sijia@andkay@JoeJimFlood@asiripanich