Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
48b7696
feat: adds initial setting_checker module to abm/models
andkay Mar 19, 2025
92fd304
chore: add .vscode settings to gitignore
andkay Mar 19, 2025
c7a1ca3
feat: adds first test case for prepopulating settings pydantic model …
andkay Mar 19, 2025
fb7d6f1
feat: adds initial spec checker - wip
andkay Mar 19, 2025
9053107
feat: update settings checker to load spec and evaluate coefficients.…
andkay Mar 19, 2025
404190d
fix: adds missing arg to eval_coefficients
andkay Mar 19, 2025
2bda8ac
feat: adds atworksubtour_frequency to settings checker
andkay Mar 20, 2025
0e88b9e
feat: moves loading spec and coefficients to independent functions
andkay Mar 20, 2025
fe65f3a
refactor: renames main settings checker function. moves loading model…
andkay Mar 20, 2025
7333c0b
refactor: moves load, spec, and coef eval checks to an independent fu…
andkay Mar 20, 2025
138b2a4
feat: adds load SPEC check for preprocessor settings
andkay Mar 20, 2025
637e98d
chore: run formatter
andkay Mar 20, 2025
19af41f
feat: initial checking for model setting with nested coefficients
andkay Mar 20, 2025
f78723c
feat: adds additional model settings. force try_load_spec to return a…
andkay Mar 30, 2025
47da4b3
feat: adds additional model settings to check. adds special handler f…
andkay Mar 30, 2025
be5d093
fixing disaggregate accessibility bug in zone sampler
aletzdy Mar 19, 2024
de6d0ef
Revert "fixing disaggregate accessibility bug in zone sampler"
i-am-sijia Apr 3, 2025
625908d
feat: adds settings check for initalize_landuse
andkay May 4, 2025
269301e
refactor: reorders checking for joint tour composition settings
andkay May 4, 2025
e14cc9c
feat: adds setting check for joint tour destination
andkay May 4, 2025
b1ca08a
feat: adds settings check for joint tour frequency composition
andkay May 4, 2025
c724fd5
feat: adds settings check for joint tour frequency
andkay May 4, 2025
172e5be
feat: adds settings check for joint tour participation
andkay May 4, 2025
3e4779b
feat: adds setting check for joint tour scheduling
andkay May 4, 2025
9dd5073
feat: adds settings checks for workplace location and school location
andkay May 4, 2025
8f7b84f
feat: adds setting check for mandatory tour frequency
andkay May 4, 2025
a25706c
feat: adds settings check for non mandatory tour destination
andkay May 4, 2025
0118406
feat: adds settings check for parking location choice
andkay May 4, 2025
15ab51f
feat: adds settings check for school escorting
andkay May 4, 2025
81bfbee
wip: adds stop_frequencies to components dict, but requires a separat…
andkay May 9, 2025
df42d08
feat: adds setting checks for summarize
andkay May 9, 2025
3a594bf
feat: adds settings check for telecommute frequency
andkay May 9, 2025
210ead0
feat: adds setting check for tour mode choice
andkay May 9, 2025
9426a71
feat: adds setting check for tour od choice
andkay May 9, 2025
14273bb
feat: adds setting check for tour scheduling probabilistic
andkay May 9, 2025
0d7c339
feat: adds setting check for transit pass ownership
andkay May 9, 2025
34c73f9
feat: adds setting check for transit pass subsidy
andkay May 9, 2025
134cc0f
feat: adds settings check for trip departure choice
andkay May 9, 2025
b9b773d
feat: adds setting check for trip destination
andkay May 9, 2025
e493dca
feat: adds setting check for write trip matrices
andkay May 9, 2025
b8bedd5
feat: adds setting check for trip mode choice
andkay May 9, 2025
a670162
feat: adds settings checks for trip purpose and destination
andkay May 9, 2025
24b47d4
feat: adds setting check for trip purpose
andkay May 9, 2025
1755e3d
feat: adds setting check for vehicle allocation
andkay May 9, 2025
b58d2be
feat: adds setting check for vehicle type choice
andkay May 9, 2025
b860a7e
feat: adds setting check for work from home
andkay May 9, 2025
df3951e
docs: remove one comment
andkay May 11, 2025
7e90a73
refactor: removes spurious debug point around cdap spec load
andkay May 11, 2025
aa2031b
refactor: refactors setting checking to separate read/evaluate. check…
andkay May 12, 2025
917bbcc
feat: adds setting check for intialize households
andkay May 12, 2025
7feccf0
feat: adds setting check for mandatory and non-mandatory tour scheduling
andkay May 12, 2025
f0c176b
feat: adds partial setting check for non-mandatory tour frequency (no…
andkay May 12, 2025
20a654f
refactor: raise RunTimeError instead of custom
andkay May 12, 2025
47ea92b
feat: adds module-specific file handler to logging
andkay May 12, 2025
1198cd0
docs: remove one comment
andkay May 12, 2025
ffaa704
refactor: add more specific return type
andkay May 12, 2025
879c033
refactor: renames try_load_and_check to try_load_and_check_spec_coefs…
andkay May 12, 2025
5bbb9c1
feat: adds initial handling for SPEC_NEST configs. includes some preq…
andkay May 13, 2025
2f95215
refactor: fix logging
andkay May 13, 2025
570ee13
docs: update one comment
andkay May 13, 2025
48a638d
refactor: remove commented raise statements used for debugging
andkay May 13, 2025
963b6ef
chore: run black formatter
andkay May 13, 2025
3664ec2
refactor: only ever evaluate spec/coef if both are available
andkay May 13, 2025
ae89183
Restore input checker docs (#941)
jpn-- May 13, 2025
96e8f52
Adding do_skim to tour mode choice (#943)
dhensle May 15, 2025
6a3c88d
SANDAG abm3 v15.0.0 contributions (#934)
i-am-sijia May 15, 2025
146c7ff
Update to use pandas v2.* (#932)
jpn-- May 20, 2025
4063cd6
pin larch<6 for now (#947)
jpn-- May 31, 2025
022775b
Minor typo/bug fixes (#945)
dkyleward Jun 2, 2025
360a5cd
chore: better logging in model settings load
andkay Jun 4, 2025
48349ed
feat: make setting checker optional
andkay Jun 4, 2025
0f99aa1
feat: adds setting check for input checker
andkay Jun 4, 2025
7f39fb5
feat: adds setting check for shadow pricing yaml
andkay Jun 4, 2025
87481f6
chore: remove some outdated comments
andkay Jun 4, 2025
7c81ded
feat: adds setting checks for intialize los
andkay Jun 4, 2025
c88b3b3
refactor: changes return type from empty df -> None when spec/coefs a…
andkay Jun 4, 2025
b598f1e
feat: adds logic for checking settings with templated coefficients
andkay Jun 7, 2025
ecc190c
chore: run formatter
andkay Jun 7, 2025
67f2b6f
chore: fix alphabetization of components registry
andkay Jun 7, 2025
e7d7b8d
feat: check settings for write_data_dictionary
andkay Jun 7, 2025
7b1c948
feat: allow for detailed checks for SPEC_SEGMENTS with PTYPE against …
andkay Jun 8, 2025
605c238
feat: allow for arbitrary loading of spec files from any subsettings …
andkay Jun 8, 2025
6c8ba86
feat: allow custom checks for unusual spec/coefficient pairs
andkay Jun 8, 2025
471faf7
feat: adds custom SettingCheckerError exception for improved logging
andkay Jun 9, 2025
b3b47af
refactor: better checks and warnings when SPEC or COEFFICENT fields are
andkay Jun 9, 2025
003071b
chore: fix spelling.
andkay Jun 9, 2025
3f386ab
refactor: renames COMPONENTS_TO_SETTINGS -> CHECKER_SETTINGS and feed…
andkay Jun 9, 2025
351836f
refactor: single entry for settings checker. import extension check s…
andkay Jun 10, 2025
f7de6c2
chore: run black formatter
andkay Jun 10, 2025
dbc2abf
refactor: remove commented code
andkay Jun 10, 2025
66797a8
fix: skip errors for write_data_dictionary if optional yaml file is n…
andkay Jun 10, 2025
866a114
chore: run black formatter
andkay Jul 2, 2025
ba4a12e
Preprocessing & Annotation functionality (#957)
dhensle Jul 17, 2025
2e5f732
Implement UV for dependency lock (#956)
i-am-sijia Jul 21, 2025
e3daa8f
Merge branch 'main' into settings-checker
jpn-- Jul 25, 2025
95e33f4
fix(tests): remove unused COEFFICIENTS from MWCOG test model
andkay Jul 26, 2025
2fa9636
fix(tests): re-add deleted test_mtc.py test script
andkay Jul 26, 2025
031b98f
Merge branch 'settings-checker' of https://github.com/camsys/activity…
andkay Jul 26, 2025
6c8063e
fix: make model registry for checking a copy
andkay Jul 26, 2025
1027026
Skim name conflicts (#939)
jpn-- Jul 29, 2025
e5316b5
fix(test): remove unused general SPEC in non_mandatory_tour_schedulin…
andkay Jul 31, 2025
58dc347
Pandas 2 `assign_in_place()` fix with categoricals (#948)
i-am-sijia Jul 31, 2025
6a553fc
PNUM hard-coded and Vehicle table creation bug fix (#953)
dhensle Jul 31, 2025
ce0470b
Merge branch 'main' into settings-checker
jpn-- Jul 31, 2025
2529e60
Minor Fixes: optional logsums, duplicate data in parking lot choice, …
dhensle Aug 13, 2025
c306a06
Merge branch 'main' into settings-checker
jpn-- Aug 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 10 additions & 28 deletions .github/workflows/branch-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
docbuild:
if: "contains(github.event.head_commit.message, '[makedocs]') && (github.repository_owner != 'ActivitySim') && (github.ref_name != 'develop')"
if: "github.event_name == 'workflow_dispatch' || (contains(github.event.head_commit.message, '[makedocs]') && (github.repository_owner != 'ActivitySim') && (github.ref_name != 'develop'))"
# develop branch docs are built at the end of the core test workflow, regardless of repository owner or commit message flags
name: ubuntu-latest py3.10
runs-on: ubuntu-latest
Expand All @@ -21,39 +21,21 @@ jobs:
with:
fetch-depth: 0 # get all tags, lets setuptools_scm do its thing

- name: Setup Miniforge
uses: conda-incubator/setup-miniconda@v2
- name: Install uv
uses: astral-sh/setup-uv@v5
with:
miniforge-version: latest
python-version: "3.10"
activate-environment: docbuild
auto-activate-base: false
auto-update-conda: false
version: "0.7.12"
enable-cache: true
cache-dependency-glob: "uv.lock"

- name: Set cache date for year and month
run: echo "DATE=$(date +'%Y%m')" >> $GITHUB_ENV

- uses: actions/cache@v3
- name: "Set up Python"
uses: actions/setup-python@v5
with:
path: /usr/share/miniconda3/envs/docbuild
key: linux-64-conda-${{ hashFiles('conda-environments/docbuild.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
id: cache

- name: Update environment
run: conda env update --verbose -n docbuild -f conda-environments/docbuild.yml
if: steps.cache.outputs.cache-hit != 'true'
python-version-file: ".python-version"

- name: Install activitysim
run: |
python -m pip install .

- name: Conda checkup
run: |
conda info -a
conda list
echo REPOSITORY ${{ github.repository }}
echo REF ${{ github.ref }}
echo REF_NAME ${{ github.ref_name }}
uv sync --locked --dev

- name: Build the docs
run: |
Expand Down
Loading