Commit b24874a

committed

Merge branch 'develop' into cfg-documentation-vy

# Conflicts: # activitysim/abm/models/util/tour_frequency.py # activitysim/examples/production_semcog/configs/logging.yaml # conda-environments/activitysim-dev-base.yml # conda-environments/activitysim-dev.yml # conda-environments/docbuild.yml # docs/models.rst

2 parents a5ee11b + 3d66176 commit b24874aCopy full SHA for b24874a

35 files changed

activitysim
- abm/models
  - __init__.py
  - input_checker.py
  - util
    - cdap.py
    - test
      - test_input_checker.py
- cli
  - run.py
- core
  - configuration.py
  - configuration
    - filesystem.py
    - top.py
- examples
  - example_manifest.yaml
  - external_example_manifest.yaml
  - production_semcog
    - .gitignore
    - configs_mp
      - settings.yaml
    - configs
    - data_model
      - enums.py
      - input_checks.py
    - data
      - Network.csv
    - test
      - test_semcog.py
  - prototype_mtc_extended
    - configs_mp
      - settings.yaml
    - configs
      - input_checker.yaml
      - settings.yaml
    - data_model
    - test
      - additional_data
        example_hwy_data.csv
      - prototype_mtc_extended_reference_pipeline.zip
      - test_mtc_extended.py
  - prototype_mtc
    - configs
      - settings.yaml
    - data
      - example_hwy_data.csv
conda-environments

`‎activitysim/abm/models/init.py‎`

-Original file line number
+Diff line change
     initialize,
     initialize_los,
     initialize_tours,
 +    input_checker,
     joint_tour_composition,
     joint_tour_destination,
     joint_tour_frequency,

Comments

(0)