Skip to content

Commit 722d6e3

Browse files
author
Ben Stabler
authored
Merge pull request #474 from ActivitySim/develop
publish v1.0.3
2 parents 4b679a0 + 0958273 commit 722d6e3

File tree

85 files changed

+82788
-2087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+82788
-2087
lines changed

‎.bumpversion.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.0.2
2+
current_version = 1.0.3
33
commit = True
44
tag = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>.*))?

‎activitysim/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# See full license in LICENSE.txt.
33

44

5-
__version__ = '1.0.2'
5+
__version__ = '1.0.3'
66
__doc__ = 'Activity-Based Travel Modeling'

‎activitysim/examples/example_manifest.yaml‎

Lines changed: 148 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -494,64 +494,164 @@
494494
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/arc_data_full/land_use.csv
495495
data/land_use.csv
496496

497-
- name: example_sandag
498-
description: 580 zone (zones 500 to 1079 to include univ) example for the SANDAG region
499-
# activitysim create -e example_sandag -d test_example_sandag
500-
# cd test_example_sandag
501-
# activitysim run -c configs -c configs_3_zone -c example_mtc/configs -d data -o output -s settings_mp.yaml
497+
- name: example_sandag_1_zone
498+
description: 57 zone 1-zone test example for the SANDAG region
499+
# activitysim create -e example_sandag_1_zone -d test_example_sandag_1_zone
500+
# cd test_example_sandag_1_zone
501+
# activitysim run -c configs_1_zone -c example_mtc/configs -d data_1 -o output_1 -s settings_mp.yaml
502502
# cd ..
503503
include:
504-
- example_sandag/data
505504
- example_sandag/../example_mtc/configs
506505
example_mtc
507-
- example_sandag/configs
506+
- example_sandag/configs_1_zone
507+
- example_sandag/data_1
508+
- example_sandag/output_1
509+
510+
- name: example_sandag_1_zone_full
511+
description: full 1-zone example for the SANDAG region
512+
# activitysim create -e example_sandag_1_zone_full -d test_example_sandag_1_zone_full
513+
# cd test_example_sandag_1_zone_full
514+
# activitysim run -c configs_1_zone -c example_mtc/configs -d data_1 -o output_1 -s settings_mp.yaml
515+
# cd ..
516+
include:
517+
- example_sandag/../example_mtc/configs
518+
example_mtc
519+
- example_sandag/configs_1_zone
520+
- example_sandag/data_1
521+
- example_sandag/output_1
522+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/households.csv
523+
data_1/households.csv
524+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/persons.csv
525+
data_1/persons.csv
526+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/land_use.csv
527+
data_1/land_use.csv
528+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims1.omx
529+
data_1/skims1.omx
530+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims2.omx
531+
data_1/skims2.omx
532+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims3.omx
533+
data_1/skims3.omx
534+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims4.omx
535+
data_1/skims4.omx
536+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims5.omx
537+
data_1/skims5.omx
538+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims6.omx
539+
data_1/skims6.omx
540+
541+
- name: example_sandag_2_zone
542+
description: 28 zone 2-zone test example for the SANDAG region
543+
# activitysim create -e example_sandag_2_zone -d test_example_sandag_2_zone
544+
# cd test_example_sandag_2_zone
545+
# activitysim run -c configs_2_zone -c example_psrc/configs -d data_2 -o output_2 -s settings_mp.yaml
546+
# cd ..
547+
include:
548+
- example_sandag/../example_psrc/configs
549+
example_psrc
550+
- example_sandag/configs_2_zone
551+
- example_sandag/data_2
552+
- example_sandag/output_2
553+
554+
- name: example_sandag_2_zone_full
555+
description: full 2-zone example for the SANDAG region
556+
# activitysim create -e example_sandag_2_zone_full -d test_example_sandag_2_zone_full
557+
# cd test_example_sandag_2_zone_full
558+
# activitysim run -c configs_2_zone -c example_psrc/configs -d data_2 -o output_2 -s settings_mp.yaml
559+
# cd ..
560+
include:
561+
- example_sandag/../example_psrc/configs
562+
example_psrc
563+
- example_sandag/configs_2_zone
564+
- example_sandag/data_2
565+
- example_sandag/output_2
566+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/households.csv
567+
data_2/households.csv
568+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/land_use.csv
569+
data_2/land_use.csv
570+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz.csv
571+
data_2/maz.csv
572+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz_to_maz_bike.csv
573+
data_2/maz_to_maz_bike.csv
574+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz_to_maz_walk.csv
575+
data_2/maz_to_maz_walk.csv
576+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/persons.csv
577+
data_2/persons.csv
578+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/taz.csv
579+
data_2/taz.csv
580+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims1.omx
581+
data_2/skims1.omx
582+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims2.omx
583+
data_2/skims2.omx
584+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims3.omx
585+
data_2/skims3.omx
586+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims4.omx
587+
data_2/skims4.omx
588+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims5.omx
589+
data_2/skims5.omx
590+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims6.omx
591+
data_2/skims6.omx
592+
593+
- name: example_sandag_3_zone
594+
description: 580 zone (zones 500 to 1079 to include univ) 3-zone example for the SANDAG region
595+
# activitysim create -e example_sandag_3_zone -d test_example_sandag_3_zone
596+
# cd test_example_sandag_3_zone
597+
# activitysim run -c configs_3_zone -c example_mtc/configs -d data_3 -o output_3 -s settings_mp.yaml
598+
# cd ..
599+
include:
600+
- example_sandag/data_3
601+
- example_sandag/../example_mtc/configs
602+
example_mtc
508603
- example_sandag/configs_3_zone
509604
- example_sandag/configs_skip_accessibility
510-
- example_sandag/output
605+
- example_sandag/output_3
511606

512-
- name: example_sandag_full
513-
description: full example for the SANDAG region
514-
# activitysim create -e example_sandag_full -d test_example_sandag_full
515-
# cd test_example_sandag_full
516-
# activitysim run -c configs -c configs_3_zone -c example_mtc/configs -d data -o output -s settings_mp.yaml
607+
- name: example_sandag_3_zone_full
608+
description: full 3-zone example for the SANDAG region
609+
# activitysim create -e example_sandag_3_zone_full -d test_example_sandag_3_zone_full
610+
# cd test_example_sandag_3_zone_full
611+
# activitysim run -c configs_3_zone -c example_mtc/configs -d data_3 -o output_3 -s settings_mp.yaml
517612
# cd ..
518613
include:
519-
- example_sandag/data
614+
- example_sandag/data_3
520615
- example_sandag/../example_mtc/configs
521616
example_mtc
522-
- example_sandag/configs
523617
- example_sandag/configs_3_zone
524618
- example_sandag/configs_skip_accessibility
525-
- example_sandag/output
526-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/taz_skims.omx
527-
data/taz_skims.omx
528-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/taz_skims2.omx
529-
data/taz_skims2.omx
530-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/taz_skims3.omx
531-
data/taz_skims3.omx
532-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/taz_skims4.omx
533-
data/taz_skims4.omx
534-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/tap_skims.omx
535-
data/tap_skims.omx
536-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/households.csv
537-
data/households.csv
538-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/persons.csv
539-
data/persons.csv
540-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/land_use.csv
541-
data/land_use.csv
542-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/maz.csv
543-
data/maz.csv
544-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/taz.csv
545-
data/taz.csv
546-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/maz_to_maz_bike.csv
547-
data/maz_to_maz_bike.csv
548-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/maz_to_maz_walk.csv
549-
data/maz_to_maz_walk.csv
550-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/maz_to_tap_walk.csv
551-
data/maz_to_tap_walk.csv
552-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/maz_to_tap_drive.csv
553-
data/maz_to_tap_drive.csv
554-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/tap.csv
555-
data/tap.csv
556-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_data_full/tap_lines.csv
557-
data/tap_lines.csv
619+
- example_sandag/output_3
620+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims1.omx
621+
data_3/taz_skims1.omx
622+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims2.omx
623+
data_3/taz_skims2.omx
624+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims3.omx
625+
data_3/taz_skims3.omx
626+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims4.omx
627+
data_3/taz_skims4.omx
628+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims1.omx
629+
data_3/tap_skims1.omx
630+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims2.omx
631+
data_3/tap_skims2.omx
632+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims3.omx
633+
data_3/tap_skims3.omx
634+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims4.omx
635+
data_3/tap_skims4.omx
636+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/households.csv
637+
data_3/households.csv
638+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/persons.csv
639+
data_3/persons.csv
640+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/land_use.csv
641+
data_3/land_use.csv
642+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz.csv
643+
data_3/maz.csv
644+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz.csv
645+
data_3/taz.csv
646+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_maz_bike.csv
647+
data_3/maz_to_maz_bike.csv
648+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_maz_walk.csv
649+
data_3/maz_to_maz_walk.csv
650+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_tap_walk.csv
651+
data_3/maz_to_tap_walk.csv
652+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_tap_drive.csv
653+
data_3/maz_to_tap_drive.csv
654+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap.csv
655+
data_3/tap.csv
656+
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_lines.csv
657+
data_3/tap_lines.csv

‎activitysim/examples/example_sandag/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

activitysim/examples/example_sandag/change_log.txt renamed to activitysim/examples/example_sandag/3_zone_change_log.txt

File renamed without changes.

‎activitysim/examples/example_sandag/configs/network_los.yaml‎

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)