Skip to content

Commit

Permalink
Merge branch 'develop' into cfg-documentation-vy
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
jpn-- committed Feb 1, 2024
2 parents a5ee11b + 3d66176 commit b24874a
Show file tree
Hide file tree
Showing 35 changed files with 82,666 additions and 107 deletions.
1 change: 1 addition & 0 deletions activitysim/abm/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
initialize,
initialize_los,
initialize_tours,
input_checker,
joint_tour_composition,
joint_tour_destination,
joint_tour_frequency,
Expand Down
Loading

0 comments on commit b24874a

Please sign in to comment.