making fixes per review comments

camsys · May 12, 2023 · c05c7f3 · c05c7f3
1 parent d52496e
commit c05c7f3
Show file tree

Hide file tree

Showing 224 changed files with 150 additions and 237 deletions.
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -180,7 +180,7 @@ jobs:
           - prototype_mtc_extended
           - placeholder_sandag
           - prototype_sandag_xborder
-          - example_semcog
+          - production_semcog
           - prototype_mwcog
           - placeholder_multiple_zone
       fail-fast: false

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+    "python.formatting.provider": "none"
+}
diff --git a/activitysim/estimation/larch/simple_simulate.py b/activitysim/estimation/larch/simple_simulate.py
@@ -295,3 +295,19 @@ def joint_tour_participation_model(
             1: 2,  # 1 means not participate, alternative 2
         },
     )
+
+def work_from_home_model(
+    name="work_from_home",
+    edb_directory="output/estimation_data_bundle/{name}/",
+    return_data=False,
+):
+    return simple_simulate_model(
+        name=name,
+        edb_directory=edb_directory,
+        return_data=return_data,
+        choices={
+            True: 1,
+            False: 2,
+        },  # True is work from home, false is does not work from home, names match spec positions
+    )
+
diff --git a/activitysim/examples/example_manifest.yaml b/activitysim/examples/example_manifest.yaml
@@ -488,34 +488,34 @@
       data/final_accessibility.csv
       949994345c9965054be260589fd64079e4032d2e4079e46b9eb9c758a40527c3
 
-- name: example_semcog
+- name: production_semcog
   description: 67 zone test example for the SEMCOG region
-  # activitysim create -e example_semcog -d test_example_semcog
-  # cd test_example_semcog
+  # activitysim create -e production_semcog -d test_production_semcog
+  # cd test_production_semcog
   # python simulation.py -c configs -o output -d data
   # cd ..
   include:
-    - example_semcog/extensions
-    - example_semcog/data
-    - example_semcog/configs
-    - example_semcog/configs_mp
-    - example_semcog/output
-    - example_semcog/README.MD
-    - example_semcog/simulation.py
+    - production_semcog/extensions
+    - production_semcog/data
+    - production_semcog/configs
+    - production_semcog/configs_mp
+    - production_semcog/output
+    - production_semcog/README.MD
+    - production_semcog/simulation.py
 
-- name: example_semcog_full
-  description: 2899 zone full size example for the SEMCOG region
-  # activitysim create -e example_semcog_full -d test_example_semcog_full
-  # cd test_example_semcog_full
+- name: production_semcog_full
+  description: 2899 zone full size production model for the SEMCOG region
+  # activitysim create -e production_semcog_full -d test_production_semcog_full
+  # cd test_production_semcog_full
   # python simulation.py -c configs_mp -c configs -o output -d data
   # cd ..
   include:
-    - example_semcog/extensions
-    - example_semcog/configs
-    - example_semcog/configs_mp
-    - example_semcog/output
-    - example_semcog/README.MD
-    - example_semcog/simulation.py
+    - production_semcog/extensions
+    - production_semcog/configs
+    - production_semcog/configs_mp
+    - production_semcog/output
+    - production_semcog/README.MD
+    - production_semcog/simulation.py
     - https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/semcog_data_full/skims_offpeak.omx
       data/skims_offpeak.omx
       685e93a725e2c04e4b1fc11b92609472c347ce830475448e39b52947fa729d80

diff --git a/activitysim/examples/example_semcog/configs/auto_ownership_coeffs_.csv b/activitysim/examples/example_semcog/configs/auto_ownership_coeffs_.csv
diff --git a/activitysim/examples/example_semcog/test/output/cache/.gitignore b/activitysim/examples/example_semcog/test/output/cache/.gitignore
diff --git a/activitysim/examples/example_semcog/test/output/log/.gitignore b/activitysim/examples/example_semcog/test/output/log/.gitignore
diff --git a/activitysim/examples/example_semcog/test/output/trace/.gitignore b/activitysim/examples/example_semcog/test/output/trace/.gitignore
diff --git a/...itysim/examples/example_semcog/.gitignore → ...sim/examples/production_semcog/.gitignore b/...itysim/examples/example_semcog/.gitignore → ...sim/examples/production_semcog/.gitignore
diff --git a/...vitysim/examples/example_semcog/README.MD → ...ysim/examples/production_semcog/README.MD b/...vitysim/examples/example_semcog/README.MD → ...ysim/examples/production_semcog/README.MD
diff --git a/...le_semcog/configs/_dummy_coefficients.csv → ...on_semcog/configs/_dummy_coefficients.csv b/...le_semcog/configs/_dummy_coefficients.csv → ...on_semcog/configs/_dummy_coefficients.csv
diff --git a/.../example_semcog/configs/accessibility.csv → ...oduction_semcog/configs/accessibility.csv b/.../example_semcog/configs/accessibility.csv → ...oduction_semcog/configs/accessibility.csv
diff --git a/...example_semcog/configs/accessibility.yaml → ...duction_semcog/configs/accessibility.yaml b/...example_semcog/configs/accessibility.yaml → ...duction_semcog/configs/accessibility.yaml
diff --git a/...le_semcog/configs/annotate_households.csv → ...on_semcog/configs/annotate_households.csv b/...le_semcog/configs/annotate_households.csv → ...on_semcog/configs/annotate_households.csv
@@ -2,7 +2,6 @@ Description,Target,Expression
 #,, annotate households table after import
 ,_PERSON_COUNT,"lambda query, persons, households: persons.query(query).groupby('household_id').size().reindex(households.index).fillna(0).astype(np.int8)"
 #,,FIXME households.income can be negative  - so we clip?
-#,income,households.hincp * households.adjinc/100000
 income,income,households.hincp.fillna(0)
 income_in_thousands,income_in_thousands,(income / 1000).clip(lower=0)
 income_segment,income_segment,"pd.cut(income_in_thousands, bins=[-np.inf, 30, 60, 100, np.inf], labels=[1, 2, 3, 4]).astype(int)"

diff --git a/...mcog/configs/annotate_households_cdap.csv → ...mcog/configs/annotate_households_cdap.csv b/...mcog/configs/annotate_households_cdap.csv → ...mcog/configs/annotate_households_cdap.csv
diff --git a/...configs/annotate_households_workplace.csv → ...configs/annotate_households_workplace.csv b/...configs/annotate_households_workplace.csv → ...configs/annotate_households_workplace.csv
diff --git a/...ample_semcog/configs/annotate_landuse.csv → ...ction_semcog/configs/annotate_landuse.csv b/...ample_semcog/configs/annotate_landuse.csv → ...ction_semcog/configs/annotate_landuse.csv
diff --git a/...ample_semcog/configs/annotate_persons.csv → ...ction_semcog/configs/annotate_persons.csv b/...ample_semcog/configs/annotate_persons.csv → ...ction_semcog/configs/annotate_persons.csv
diff --git a/...cog/configs/annotate_persons_after_hh.csv → ...cog/configs/annotate_persons_after_hh.csv b/...cog/configs/annotate_persons_after_hh.csv → ...cog/configs/annotate_persons_after_hh.csv
diff --git a/..._semcog/configs/annotate_persons_cdap.csv → ..._semcog/configs/annotate_persons_cdap.csv b/..._semcog/configs/annotate_persons_cdap.csv → ..._semcog/configs/annotate_persons_cdap.csv
@@ -4,4 +4,3 @@ travel_active,travel_active,persons.cdap_activity != CDAP_ACTIVITY_HOME
 under16_not_at_school,under16_not_at_school,"persons.ptype.isin([PTYPE_SCHOOL, PTYPE_PRESCHOOL]) & persons.cdap_activity.isin(['N', 'H'])"
 has_preschool_kid_at_home,has_preschool_kid_at_home,"other_than(persons.household_id, (persons.ptype == PTYPE_PRESCHOOL) & (persons.cdap_activity == 'H'))"
 has_school_kid_at_home,has_school_kid_at_home,"other_than(persons.household_id, (persons.ptype == PTYPE_SCHOOL) & (persons.cdap_activity == 'H'))"
-#,cdap_activity,"np.where((persons.work_from_home) & (persons.cdap_activity=='M'), np.random.choice(['N','H']), persons.cdap_activity)"
diff --git a/...e_semcog/configs/annotate_persons_jtp.csv → ...n_semcog/configs/annotate_persons_jtp.csv b/...e_semcog/configs/annotate_persons_jtp.csv → ...n_semcog/configs/annotate_persons_jtp.csv
diff --git a/...e_semcog/configs/annotate_persons_mtf.csv → ...n_semcog/configs/annotate_persons_mtf.csv b/...e_semcog/configs/annotate_persons_mtf.csv → ...n_semcog/configs/annotate_persons_mtf.csv
diff --git a/..._semcog/configs/annotate_persons_nmtf.csv → ..._semcog/configs/annotate_persons_nmtf.csv b/..._semcog/configs/annotate_persons_nmtf.csv → ..._semcog/configs/annotate_persons_nmtf.csv
diff --git a/...emcog/configs/annotate_persons_school.csv → ...emcog/configs/annotate_persons_school.csv b/...emcog/configs/annotate_persons_school.csv → ...emcog/configs/annotate_persons_school.csv
@@ -5,5 +5,3 @@ Description,Target,Expression
 temp auto_time_to_school,_auto_time_to_school,"skim_dict.lookup(persons.home_zone_id, persons.school_zone_id, ('SOV_TIME', 'MD'))"
 temp auto_time_return,_auto_time_return,"skim_dict.lookup(persons.school_zone_id, persons.home_zone_id, ('SOV_TIME', 'MD'))"
 free flow roundtrip_auto_time_to_school,roundtrip_auto_time_to_school,"np.where(persons.school_zone_id>=0,_auto_time_to_school + _auto_time_return,0)"
-#,,
-#,home_county,"reindex(land_use.COUNTY, persons.home_zone_id)"
diff --git a/...og/configs/annotate_persons_workplace.csv → ...og/configs/annotate_persons_workplace.csv b/...og/configs/annotate_persons_workplace.csv → ...og/configs/annotate_persons_workplace.csv
@@ -32,6 +32,5 @@ work_zone_area_type,work_zone_area_type,"reindex(land_use.AreaType, persons.work
 ,work_auto_savings_ratio,"(work_auto_savings / 120.0).clip(-1.0, 1.0)"
 ,umich_student,df.school_zone_id.isin(land_use[land_use.University_Name=='University of Michigan'].index.values)
 ,umich_worker,df.workplace_zone_id.isin(land_use[land_use.University_Name=='University of Michigan'].index.values)
-#,umich_affiliate,"df.get(umich_worker, default=False) | df.get(umich_student, default=False)"
 #,,
 ,dest_hourly_peak_parking_cost,"reindex(land_use.parking_hourly, df.workplace_zone_id)"
diff --git a/...og/configs/atwork_subtour_destination.csv → ...og/configs/atwork_subtour_destination.csv b/...og/configs/atwork_subtour_destination.csv → ...og/configs/atwork_subtour_destination.csv
diff --git a/...g/configs/atwork_subtour_destination.yaml → ...g/configs/atwork_subtour_destination.yaml b/...g/configs/atwork_subtour_destination.yaml → ...g/configs/atwork_subtour_destination.yaml
diff --git a/...igs/atwork_subtour_destination_coeffs.csv → ...igs/atwork_subtour_destination_coeffs.csv b/...igs/atwork_subtour_destination_coeffs.csv → ...igs/atwork_subtour_destination_coeffs.csv
diff --git a/...igs/atwork_subtour_destination_sample.csv → ...igs/atwork_subtour_destination_sample.csv b/...igs/atwork_subtour_destination_sample.csv → ...igs/atwork_subtour_destination_sample.csv
diff --git a/...mcog/configs/atwork_subtour_frequency.csv → ...mcog/configs/atwork_subtour_frequency.csv b/...mcog/configs/atwork_subtour_frequency.csv → ...mcog/configs/atwork_subtour_frequency.csv
@@ -4,7 +4,7 @@ util_dummy_for_non_full_time_worker,pemploy!=1,coefficient_dummy_for_non_full_ti
 util_dummy_for_non_workers,"ptype in [4, 5]",coefficient_dummy_for_non_workers_no_subtours,coefficient_dummy_for_non_workers_eat,coefficient_dummy_for_non_workers_business1,coefficient_dummy_for_non_workers_maint,coefficient_dummy_for_non_workers_business2,coefficient_dummy_for_non_workers_eat_business
 util_medium_hh_income_dummy,income_segment == 2,coefficient_medium_hh_income_dummy_no_subtours,coefficient_medium_hh_income_dummy_eat,coefficient_medium_hh_income_dummy_business1,coefficient_medium_hh_income_dummy_maint,coefficient_medium_hh_income_dummy_business2,coefficient_medium_hh_income_dummy_eat_business
 util_high_hh_income_dummy,(income_segment > 2) & (income_segment < 5),coefficient_high_hh_income_dummy_no_subtours,coefficient_high_hh_income_dummy_eat,coefficient_high_hh_income_dummy_business1,coefficient_high_hh_income_dummy_maint,coefficient_high_hh_income_dummy_business2,coefficient_high_hh_income_dummy_eat_business
-util_zero_cars_owned_by_hh_dummy, auto_ownership == 0,coefficient_zero_cars_owned_by_hh_dummy_no_subtours,coefficient_zero_cars_owned_by_hh_dummy_eat,coefficient_zero_cars_owned_by_hh_dummy_business1,coefficient_zero_cars_owned_by_hh_dummy_maint,coefficient_zero_cars_owned_by_hh_dummy_business2,coefficient_zero_cars_owned_by_hh_dummy_eat_business
+util_zero_cars_owned_by_hh_dummy,auto_ownership == 0,coefficient_zero_cars_owned_by_hh_dummy_no_subtours,coefficient_zero_cars_owned_by_hh_dummy_eat,coefficient_zero_cars_owned_by_hh_dummy_business1,coefficient_zero_cars_owned_by_hh_dummy_maint,coefficient_zero_cars_owned_by_hh_dummy_business2,coefficient_zero_cars_owned_by_hh_dummy_eat_business
 util_individual_discretionary_tours_made_by_full_time_worker,@(df.pemploy==1)*df.num_discr_tours,coefficient_individual_discretionary_tours_made_by_full_time_worker_no_subtours,coefficient_individual_discretionary_tours_made_by_full_time_worker_eat,coefficient_individual_discretionary_tours_made_by_full_time_worker_business1,coefficient_individual_discretionary_tours_made_by_full_time_worker_maint,coefficient_individual_discretionary_tours_made_by_full_time_worker_business2,coefficient_individual_discretionary_tours_made_by_full_time_worker_eat_business
 util_individual_discretionary_tours_made_by_part_time_worker,@(df.pemploy==2)*df.num_discr_tours,coefficient_individual_discretionary_tours_made_by_part_time_worker_no_subtours,coefficient_individual_discretionary_tours_made_by_part_time_worker_eat,coefficient_individual_discretionary_tours_made_by_part_time_worker_business1,coefficient_individual_discretionary_tours_made_by_part_time_worker_maint,coefficient_individual_discretionary_tours_made_by_part_time_worker_business2,coefficient_individual_discretionary_tours_made_by_part_time_worker_eat_business
 util_individual_eating_out_tours_made_by_person,num_eatout_tours,coefficient_individual_eating_out_tours_made_by_person_no_subtours,coefficient_individual_eating_out_tours_made_by_person_eat,coefficient_individual_eating_out_tours_made_by_person_business1,coefficient_individual_eating_out_tours_made_by_person_maint,coefficient_individual_eating_out_tours_made_by_person_business2,coefficient_individual_eating_out_tours_made_by_person_eat_business

diff --git a/...cog/configs/atwork_subtour_frequency.yaml → ...cog/configs/atwork_subtour_frequency.yaml b/...cog/configs/atwork_subtour_frequency.yaml → ...cog/configs/atwork_subtour_frequency.yaml
diff --git a/...atwork_subtour_frequency_alternatives.csv → ...atwork_subtour_frequency_alternatives.csv b/...atwork_subtour_frequency_alternatives.csv → ...atwork_subtour_frequency_alternatives.csv
diff --git a/...frequency_annotate_tours_preprocessor.csv → ...frequency_annotate_tours_preprocessor.csv b/...frequency_annotate_tours_preprocessor.csv → ...frequency_annotate_tours_preprocessor.csv
diff --git a/...nfigs/atwork_subtour_frequency_coeffs.csv → ...nfigs/atwork_subtour_frequency_coeffs.csv b/...nfigs/atwork_subtour_frequency_coeffs.csv → ...nfigs/atwork_subtour_frequency_coeffs.csv
diff --git a/...example_semcog/configs/auto_ownership.csv → ...duction_semcog/configs/auto_ownership.csv b/...example_semcog/configs/auto_ownership.csv → ...duction_semcog/configs/auto_ownership.csv
diff --git a/...xample_semcog/configs/auto_ownership.yaml → ...uction_semcog/configs/auto_ownership.yaml b/...xample_semcog/configs/auto_ownership.yaml → ...uction_semcog/configs/auto_ownership.yaml
diff --git a/..._semcog/configs/auto_ownership_coeffs.csv → ..._semcog/configs/auto_ownership_coeffs.csv b/..._semcog/configs/auto_ownership_coeffs.csv → ..._semcog/configs/auto_ownership_coeffs.csv
diff --git a/...examples/example_semcog/configs/cdap.yaml → ...mples/production_semcog/configs/cdap.yaml b/...examples/example_semcog/configs/cdap.yaml → ...mples/production_semcog/configs/cdap.yaml
diff --git a/...nfigs/cdap_fixed_relative_proportions.csv → ...nfigs/cdap_fixed_relative_proportions.csv b/...nfigs/cdap_fixed_relative_proportions.csv → ...nfigs/cdap_fixed_relative_proportions.csv
diff --git a/...semcog/configs/cdap_indiv_and_hhsize1.csv → ...semcog/configs/cdap_indiv_and_hhsize1.csv b/...semcog/configs/cdap_indiv_and_hhsize1.csv → ...semcog/configs/cdap_indiv_and_hhsize1.csv
diff --git a/...configs/cdap_interaction_coefficients.csv → ...configs/cdap_interaction_coefficients.csv b/...configs/cdap_interaction_coefficients.csv → ...configs/cdap_interaction_coefficients.csv
diff --git a/...les/example_semcog/configs/constants.yaml → .../production_semcog/configs/constants.yaml b/...les/example_semcog/configs/constants.yaml → .../production_semcog/configs/constants.yaml
diff --git a/...configs/destination_choice_size_terms.csv → ...configs/destination_choice_size_terms.csv b/...configs/destination_choice_size_terms.csv → ...configs/destination_choice_size_terms.csv
diff --git a/...s/example_semcog/configs/free_parking.csv → ...roduction_semcog/configs/free_parking.csv b/...s/example_semcog/configs/free_parking.csv → ...roduction_semcog/configs/free_parking.csv
diff --git a/.../example_semcog/configs/free_parking.yaml → ...oduction_semcog/configs/free_parking.yaml b/.../example_semcog/configs/free_parking.yaml → ...oduction_semcog/configs/free_parking.yaml
diff --git a/...parking_annotate_persons_preprocessor.csv → ...parking_annotate_persons_preprocessor.csv b/...parking_annotate_persons_preprocessor.csv → ...parking_annotate_persons_preprocessor.csv
diff --git a/...le_semcog/configs/free_parking_coeffs.csv → ...on_semcog/configs/free_parking_coeffs.csv b/...le_semcog/configs/free_parking_coeffs.csv → ...on_semcog/configs/free_parking_coeffs.csv
diff --git a/...semcog/configs/initialize_households.yaml → ...semcog/configs/initialize_households.yaml b/...semcog/configs/initialize_households.yaml → ...semcog/configs/initialize_households.yaml
diff --git a/...le_semcog/configs/initialize_landuse.yaml → ...on_semcog/configs/initialize_landuse.yaml b/...le_semcog/configs/initialize_landuse.yaml → ...on_semcog/configs/initialize_landuse.yaml
diff --git a/...semcog/configs/joint_tour_composition.csv → ...semcog/configs/joint_tour_composition.csv b/...semcog/configs/joint_tour_composition.csv → ...semcog/configs/joint_tour_composition.csv
diff --git a/...emcog/configs/joint_tour_composition.yaml → ...emcog/configs/joint_tour_composition.yaml b/...emcog/configs/joint_tour_composition.yaml → ...emcog/configs/joint_tour_composition.yaml
diff --git a/...tion_annotate_households_preprocessor.csv → ...tion_annotate_households_preprocessor.csv b/...tion_annotate_households_preprocessor.csv → ...tion_annotate_households_preprocessor.csv
diff --git a/...configs/joint_tour_composition_coeffs.csv → ...configs/joint_tour_composition_coeffs.csv b/...configs/joint_tour_composition_coeffs.csv → ...configs/joint_tour_composition_coeffs.csv
diff --git a/...semcog/configs/joint_tour_destination.csv → ...semcog/configs/joint_tour_destination.csv b/...semcog/configs/joint_tour_destination.csv → ...semcog/configs/joint_tour_destination.csv
diff --git a/...emcog/configs/joint_tour_destination.yaml → ...emcog/configs/joint_tour_destination.yaml b/...emcog/configs/joint_tour_destination.yaml → ...emcog/configs/joint_tour_destination.yaml
diff --git a/...configs/joint_tour_destination_coeffs.csv → ...configs/joint_tour_destination_coeffs.csv b/...configs/joint_tour_destination_coeffs.csv → ...configs/joint_tour_destination_coeffs.csv
diff --git a/...configs/joint_tour_destination_sample.csv → ...configs/joint_tour_destination_sample.csv b/...configs/joint_tour_destination_sample.csv → ...configs/joint_tour_destination_sample.csv
diff --git a/...e_semcog/configs/joint_tour_frequency.csv → ...n_semcog/configs/joint_tour_frequency.csv b/...e_semcog/configs/joint_tour_frequency.csv → ...n_semcog/configs/joint_tour_frequency.csv
diff --git a/..._semcog/configs/joint_tour_frequency.yaml → ..._semcog/configs/joint_tour_frequency.yaml b/..._semcog/configs/joint_tour_frequency.yaml → ..._semcog/configs/joint_tour_frequency.yaml
diff --git a/...igs/joint_tour_frequency_alternatives.csv → ...igs/joint_tour_frequency_alternatives.csv b/...igs/joint_tour_frequency_alternatives.csv → ...igs/joint_tour_frequency_alternatives.csv
diff --git a/...ency_annotate_households_preprocessor.csv → ...ency_annotate_households_preprocessor.csv b/...ency_annotate_households_preprocessor.csv → ...ency_annotate_households_preprocessor.csv
diff --git a/...g/configs/joint_tour_frequency_coeffs.csv → ...g/configs/joint_tour_frequency_coeffs.csv b/...g/configs/joint_tour_frequency_coeffs.csv → ...g/configs/joint_tour_frequency_coeffs.csv
diff --git a/...mcog/configs/joint_tour_participation.csv → ...mcog/configs/joint_tour_participation.csv b/...mcog/configs/joint_tour_participation.csv → ...mcog/configs/joint_tour_participation.csv
diff --git a/...cog/configs/joint_tour_participation.yaml → ...cog/configs/joint_tour_participation.yaml b/...cog/configs/joint_tour_participation.yaml → ...cog/configs/joint_tour_participation.yaml
diff --git a/...on_annotate_participants_preprocessor.csv → ...on_annotate_participants_preprocessor.csv b/...on_annotate_participants_preprocessor.csv → ...on_annotate_participants_preprocessor.csv
diff --git a/...nfigs/joint_tour_participation_coeffs.csv → ...nfigs/joint_tour_participation_coeffs.csv b/...nfigs/joint_tour_participation_coeffs.csv → ...nfigs/joint_tour_participation_coeffs.csv
diff --git a/...semcog/configs/joint_tour_scheduling.yaml → ...semcog/configs/joint_tour_scheduling.yaml b/...semcog/configs/joint_tour_scheduling.yaml → ...semcog/configs/joint_tour_scheduling.yaml
diff --git a/...cheduling_annotate_tours_preprocessor.csv → ...cheduling_annotate_tours_preprocessor.csv b/...cheduling_annotate_tours_preprocessor.csv → ...cheduling_annotate_tours_preprocessor.csv
diff --git a/...mples/example_semcog/configs/logging.yaml → ...es/production_semcog/configs/logging.yaml b/...mples/example_semcog/configs/logging.yaml → ...es/production_semcog/configs/logging.yaml
diff --git a/...mcog/configs/mandatory_tour_frequency.csv → ...mcog/configs/mandatory_tour_frequency.csv b/...mcog/configs/mandatory_tour_frequency.csv → ...mcog/configs/mandatory_tour_frequency.csv
@@ -25,10 +25,10 @@ util_can_walk_to_work_retired,Can walk to work - Retired interaction,(ptype == 5
 util_can_walk_to_school_univ,Can walk to school - University student interaction,(ptype == 3) & (distance_to_school < 3),,,,coef_can_walk_to_work_school2,
 util_can_walk_to_school_driving_age_child,Can walk to school - Driving-age child interaction,(ptype == 6) & (distance_to_school < 3),,,,coef_can_walk_to_work_school2,
 util_can_walk_to_school_pre_driving_age_child,Can walk to school - Pre-driving age child who is in school interaction,(ptype == 7) & (distance_to_school < 3),,,,coef_can_walk_to_work_school2,
-util_can_walk_to_work_or_school_ft,Can walk to work or school - Full-time worker interaction,(ptype == 1) & (distance_to_work < 3 | distance_to_school < 3),,,,,coef_can_walk_to_work_and_school
-util_can_walk_to_work_or_school_pt,Can walk to work or school - Part-time worker interaction,(ptype == 2) & (distance_to_work < 3 | distance_to_school < 3),,,,,coef_can_walk_to_work_and_school
-util_can_walk_to_work_or_school_univ,Can walk to work or school - University student interaction,(ptype == 3) & (distance_to_work < 3 | distance_to_school < 3),,,,,coef_can_walk_to_work_and_school
-util_can_walk_to_work_or_school_driving_age_child,Can walk to work or school - Driving-age child interaction,(ptype == 6) & (distance_to_work < 3 | distance_to_school < 3),,,,,coef_can_walk_to_work_and_school
+util_can_walk_to_work_or_school_ft,Can walk to work or school - Full-time worker interaction,(ptype == 1) & ((distance_to_work < 3) | (distance_to_school < 3)),,,,,coef_can_walk_to_work_and_school
+util_can_walk_to_work_or_school_pt,Can walk to work or school - Part-time worker interaction,(ptype == 2) & ((distance_to_work < 3) | (distance_to_school < 3)),,,,,coef_can_walk_to_work_and_school
+util_can_walk_to_work_or_school_univ,Can walk to work or school - University student interaction,(ptype == 3) & ((distance_to_work < 3) | (distance_to_school < 3)),,,,,coef_can_walk_to_work_and_school
+util_can_walk_to_work_or_school_driving_age_child,Can walk to work or school - Driving-age child interaction,(ptype == 6) & ((distance_to_work < 3) | (distance_to_school < 3)),,,,,coef_can_walk_to_work_and_school
 util_round_trip_auto_time_to_work_ft,Round trip auto time to work - Full-time worker interaction,(ptype == 1) * roundtrip_auto_time_to_work,,coef_round_trip_auto_time_to_work_work2,,,coef_round_trip_auto_time_to_work_school2
 util_round_trip_auto_time_to_work_pt,Round trip auto time to work - Part-time worker interaction,(ptype == 2) * roundtrip_auto_time_to_work,,coef_round_trip_auto_time_to_work_work2,,,coef_round_trip_auto_time_to_work_school2
 util_round_trip_auto_time_to_work_univ,Round trip auto time to work - University student interaction,(ptype == 3) * roundtrip_auto_time_to_work,,coef_round_trip_auto_time_to_work_work2,,,coef_round_trip_auto_time_to_work_school2

diff --git a/...cog/configs/mandatory_tour_frequency.yaml → ...cog/configs/mandatory_tour_frequency.yaml b/...cog/configs/mandatory_tour_frequency.yaml → ...cog/configs/mandatory_tour_frequency.yaml
diff --git a/...mandatory_tour_frequency_alternatives.csv → ...mandatory_tour_frequency_alternatives.csv b/...mandatory_tour_frequency_alternatives.csv → ...mandatory_tour_frequency_alternatives.csv
diff --git a/...nfigs/mandatory_tour_frequency_coeffs.csv → ...nfigs/mandatory_tour_frequency_coeffs.csv b/...nfigs/mandatory_tour_frequency_coeffs.csv → ...nfigs/mandatory_tour_frequency_coeffs.csv
diff --git a/...og/configs/mandatory_tour_scheduling.yaml → ...og/configs/mandatory_tour_scheduling.yaml b/...og/configs/mandatory_tour_scheduling.yaml → ...og/configs/mandatory_tour_scheduling.yaml
diff --git a/...scheduling_annotate_alts_preprocessor.csv → ...scheduling_annotate_alts_preprocessor.csv b/...scheduling_annotate_alts_preprocessor.csv → ...scheduling_annotate_alts_preprocessor.csv
diff --git a/...s/example_semcog/configs/network_los.yaml → ...roduction_semcog/configs/network_los.yaml b/...s/example_semcog/configs/network_los.yaml → ...roduction_semcog/configs/network_los.yaml
diff --git a/...onfigs/non_mandatory_tour_destination.csv → ...onfigs/non_mandatory_tour_destination.csv b/...onfigs/non_mandatory_tour_destination.csv → ...onfigs/non_mandatory_tour_destination.csv
diff --git a/...nfigs/non_mandatory_tour_destination.yaml → ...nfigs/non_mandatory_tour_destination.yaml b/...nfigs/non_mandatory_tour_destination.yaml → ...nfigs/non_mandatory_tour_destination.yaml
diff --git a/...non_mandatory_tour_destination_coeffs.csv → ...non_mandatory_tour_destination_coeffs.csv b/...non_mandatory_tour_destination_coeffs.csv → ...non_mandatory_tour_destination_coeffs.csv
diff --git a/...non_mandatory_tour_destination_sample.csv → ...non_mandatory_tour_destination_sample.csv b/...non_mandatory_tour_destination_sample.csv → ...non_mandatory_tour_destination_sample.csv
diff --git a/.../configs/non_mandatory_tour_frequency.csv → .../configs/non_mandatory_tour_frequency.csv b/.../configs/non_mandatory_tour_frequency.csv → .../configs/non_mandatory_tour_frequency.csv
diff --git a/...configs/non_mandatory_tour_frequency.yaml → ...configs/non_mandatory_tour_frequency.yaml b/...configs/non_mandatory_tour_frequency.yaml → ...configs/non_mandatory_tour_frequency.yaml
diff --git a/...mandatory_tour_frequency_alternatives.csv → ...mandatory_tour_frequency_alternatives.csv b/...mandatory_tour_frequency_alternatives.csv → ...mandatory_tour_frequency_alternatives.csv
diff --git a/...equency_annotate_persons_preprocessor.csv → ...equency_annotate_persons_preprocessor.csv b/...equency_annotate_persons_preprocessor.csv → ...equency_annotate_persons_preprocessor.csv
diff --git a/...y_tour_frequency_coeffs_PTYPE_DRIVING.csv → ...y_tour_frequency_coeffs_PTYPE_DRIVING.csv b/...y_tour_frequency_coeffs_PTYPE_DRIVING.csv → ...y_tour_frequency_coeffs_PTYPE_DRIVING.csv
diff --git a/...tory_tour_frequency_coeffs_PTYPE_FULL.csv → ...tory_tour_frequency_coeffs_PTYPE_FULL.csv b/...tory_tour_frequency_coeffs_PTYPE_FULL.csv → ...tory_tour_frequency_coeffs_PTYPE_FULL.csv
diff --git a/...y_tour_frequency_coeffs_PTYPE_NONWORK.csv → ...y_tour_frequency_coeffs_PTYPE_NONWORK.csv b/...y_tour_frequency_coeffs_PTYPE_NONWORK.csv → ...y_tour_frequency_coeffs_PTYPE_NONWORK.csv
diff --git a/...tory_tour_frequency_coeffs_PTYPE_PART.csv → ...tory_tour_frequency_coeffs_PTYPE_PART.csv b/...tory_tour_frequency_coeffs_PTYPE_PART.csv → ...tory_tour_frequency_coeffs_PTYPE_PART.csv
diff --git a/...tour_frequency_coeffs_PTYPE_PRESCHOOL.csv → ...tour_frequency_coeffs_PTYPE_PRESCHOOL.csv b/...tour_frequency_coeffs_PTYPE_PRESCHOOL.csv → ...tour_frequency_coeffs_PTYPE_PRESCHOOL.csv
diff --git a/...y_tour_frequency_coeffs_PTYPE_RETIRED.csv → ...y_tour_frequency_coeffs_PTYPE_RETIRED.csv b/...y_tour_frequency_coeffs_PTYPE_RETIRED.csv → ...y_tour_frequency_coeffs_PTYPE_RETIRED.csv
diff --git a/...ry_tour_frequency_coeffs_PTYPE_SCHOOL.csv → ...ry_tour_frequency_coeffs_PTYPE_SCHOOL.csv b/...ry_tour_frequency_coeffs_PTYPE_SCHOOL.csv → ...ry_tour_frequency_coeffs_PTYPE_SCHOOL.csv
diff --git a/...our_frequency_coeffs_PTYPE_UNIVERSITY.csv → ...our_frequency_coeffs_PTYPE_UNIVERSITY.csv b/...our_frequency_coeffs_PTYPE_UNIVERSITY.csv → ...our_frequency_coeffs_PTYPE_UNIVERSITY.csv
diff --git a/...datory_tour_frequency_extension_probs.csv → ...datory_tour_frequency_extension_probs.csv b/...datory_tour_frequency_extension_probs.csv → ...datory_tour_frequency_extension_probs.csv
diff --git a/...onfigs/non_mandatory_tour_scheduling.yaml → ...onfigs/non_mandatory_tour_scheduling.yaml b/...onfigs/non_mandatory_tour_scheduling.yaml → ...onfigs/non_mandatory_tour_scheduling.yaml
diff --git a/...cheduling_annotate_tours_preprocessor.csv → ...cheduling_annotate_tours_preprocessor.csv b/...cheduling_annotate_tours_preprocessor.csv → ...cheduling_annotate_tours_preprocessor.csv
diff --git a/...arking_location_choice_at_university.yaml → ...arking_location_choice_at_university.yaml b/...arking_location_choice_at_university.yaml → ...arking_location_choice_at_university.yaml
diff --git a/...semcog/configs/school_location - Copy.csv → ...semcog/configs/school_location - Copy.csv b/...semcog/configs/school_location - Copy.csv → ...semcog/configs/school_location - Copy.csv
diff --git a/...xample_semcog/configs/school_location.csv → ...uction_semcog/configs/school_location.csv b/...xample_semcog/configs/school_location.csv → ...uction_semcog/configs/school_location.csv
diff --git a/...ample_semcog/configs/school_location.yaml → ...ction_semcog/configs/school_location.yaml b/...ample_semcog/configs/school_location.yaml → ...ction_semcog/configs/school_location.yaml
diff --git a/...semcog/configs/school_location_coeffs.csv → ...semcog/configs/school_location_coeffs.csv b/...semcog/configs/school_location_coeffs.csv → ...semcog/configs/school_location_coeffs.csv
diff --git a/...semcog/configs/school_location_sample.csv → ...semcog/configs/school_location_sample.csv b/...semcog/configs/school_location_sample.csv → ...semcog/configs/school_location_sample.csv
diff --git a/...ples/example_semcog/configs/settings.yaml → ...s/production_semcog/configs/settings.yaml b/...ples/example_semcog/configs/settings.yaml → ...s/production_semcog/configs/settings.yaml
diff --git a/...ample_semcog/configs/settings_source.yaml → ...ction_semcog/configs/settings_source.yaml b/...ample_semcog/configs/settings_source.yaml → ...ction_semcog/configs/settings_source.yaml
diff --git a/...xample_semcog/configs/shadow_pricing.yaml → ...uction_semcog/configs/shadow_pricing.yaml b/...xample_semcog/configs/shadow_pricing.yaml → ...uction_semcog/configs/shadow_pricing.yaml
diff --git a/...xample_semcog/configs/stop_frequency.yaml → ...uction_semcog/configs/stop_frequency.yaml b/...xample_semcog/configs/stop_frequency.yaml → ...uction_semcog/configs/stop_frequency.yaml
diff --git a/...g/configs/stop_frequency_alternatives.csv → ...g/configs/stop_frequency_alternatives.csv b/...g/configs/stop_frequency_alternatives.csv → ...g/configs/stop_frequency_alternatives.csv
diff --git a/...frequency_annotate_tours_preprocessor.csv → ...frequency_annotate_tours_preprocessor.csv b/...frequency_annotate_tours_preprocessor.csv → ...frequency_annotate_tours_preprocessor.csv
diff --git a/..._semcog/configs/stop_frequency_atwork.csv → ..._semcog/configs/stop_frequency_atwork.csv b/..._semcog/configs/stop_frequency_atwork.csv → ..._semcog/configs/stop_frequency_atwork.csv
diff --git a/...gs/stop_frequency_coefficients_atwork.csv → ...gs/stop_frequency_coefficients_atwork.csv b/...gs/stop_frequency_coefficients_atwork.csv → ...gs/stop_frequency_coefficients_atwork.csv
diff --git a/...gs/stop_frequency_coefficients_eatout.csv → ...gs/stop_frequency_coefficients_eatout.csv b/...gs/stop_frequency_coefficients_eatout.csv → ...gs/stop_frequency_coefficients_eatout.csv
diff --git a/...gs/stop_frequency_coefficients_escort.csv → ...gs/stop_frequency_coefficients_escort.csv b/...gs/stop_frequency_coefficients_escort.csv → ...gs/stop_frequency_coefficients_escort.csv
diff --git a/.../stop_frequency_coefficients_othdiscr.csv → .../stop_frequency_coefficients_othdiscr.csv b/.../stop_frequency_coefficients_othdiscr.csv → .../stop_frequency_coefficients_othdiscr.csv
diff --git a/.../stop_frequency_coefficients_othmaint.csv → .../stop_frequency_coefficients_othmaint.csv b/.../stop_frequency_coefficients_othmaint.csv → .../stop_frequency_coefficients_othmaint.csv
diff --git a/...gs/stop_frequency_coefficients_school.csv → ...gs/stop_frequency_coefficients_school.csv b/...gs/stop_frequency_coefficients_school.csv → ...gs/stop_frequency_coefficients_school.csv
diff --git a/.../stop_frequency_coefficients_shopping.csv → .../stop_frequency_coefficients_shopping.csv b/.../stop_frequency_coefficients_shopping.csv → .../stop_frequency_coefficients_shopping.csv
diff --git a/...gs/stop_frequency_coefficients_social.csv → ...gs/stop_frequency_coefficients_social.csv b/...gs/stop_frequency_coefficients_social.csv → ...gs/stop_frequency_coefficients_social.csv
diff --git a/...figs/stop_frequency_coefficients_univ.csv → ...figs/stop_frequency_coefficients_univ.csv b/...figs/stop_frequency_coefficients_univ.csv → ...figs/stop_frequency_coefficients_univ.csv
diff --git a/...figs/stop_frequency_coefficients_work.csv → ...figs/stop_frequency_coefficients_work.csv b/...figs/stop_frequency_coefficients_work.csv → ...figs/stop_frequency_coefficients_work.csv
diff --git a/..._semcog/configs/stop_frequency_eatout.csv → ..._semcog/configs/stop_frequency_eatout.csv b/..._semcog/configs/stop_frequency_eatout.csv → ..._semcog/configs/stop_frequency_eatout.csv
diff --git a/..._semcog/configs/stop_frequency_escort.csv → ..._semcog/configs/stop_frequency_escort.csv b/..._semcog/configs/stop_frequency_escort.csv → ..._semcog/configs/stop_frequency_escort.csv
diff --git a/...emcog/configs/stop_frequency_othdiscr.csv → ...emcog/configs/stop_frequency_othdiscr.csv b/...emcog/configs/stop_frequency_othdiscr.csv → ...emcog/configs/stop_frequency_othdiscr.csv
diff --git a/...emcog/configs/stop_frequency_othmaint.csv → ...emcog/configs/stop_frequency_othmaint.csv b/...emcog/configs/stop_frequency_othmaint.csv → ...emcog/configs/stop_frequency_othmaint.csv
diff --git a/..._semcog/configs/stop_frequency_school.csv → ..._semcog/configs/stop_frequency_school.csv b/..._semcog/configs/stop_frequency_school.csv → ..._semcog/configs/stop_frequency_school.csv
diff --git a/...emcog/configs/stop_frequency_shopping.csv → ...emcog/configs/stop_frequency_shopping.csv b/...emcog/configs/stop_frequency_shopping.csv → ...emcog/configs/stop_frequency_shopping.csv
diff --git a/..._semcog/configs/stop_frequency_social.csv → ..._semcog/configs/stop_frequency_social.csv b/..._semcog/configs/stop_frequency_social.csv → ..._semcog/configs/stop_frequency_social.csv
diff --git a/...le_semcog/configs/stop_frequency_univ.csv → ...on_semcog/configs/stop_frequency_univ.csv b/...le_semcog/configs/stop_frequency_univ.csv → ...on_semcog/configs/stop_frequency_univ.csv
diff --git a/...gs/stop_frequency_university_parking.yaml → ...gs/stop_frequency_university_parking.yaml b/...gs/stop_frequency_university_parking.yaml → ...gs/stop_frequency_university_parking.yaml
diff --git a/...le_semcog/configs/stop_frequency_work.csv → ...on_semcog/configs/stop_frequency_work.csv b/...le_semcog/configs/stop_frequency_work.csv → ...on_semcog/configs/stop_frequency_work.csv
diff --git a/..._semcog/configs/telecommute_frequency.csv → ..._semcog/configs/telecommute_frequency.csv b/..._semcog/configs/telecommute_frequency.csv → ..._semcog/configs/telecommute_frequency.csv
diff --git a/...semcog/configs/telecommute_frequency.yaml → ...semcog/configs/telecommute_frequency.yaml b/...semcog/configs/telecommute_frequency.yaml → ...semcog/configs/telecommute_frequency.yaml
diff --git a/.../configs/telecommute_frequency_coeffs.csv → .../configs/telecommute_frequency_coeffs.csv b/.../configs/telecommute_frequency_coeffs.csv → .../configs/telecommute_frequency_coeffs.csv
diff --git a/...r_departure_and_duration_alternatives.csv → ...r_departure_and_duration_alternatives.csv b/...r_departure_and_duration_alternatives.csv → ...r_departure_and_duration_alternatives.csv
diff --git a/.../tour_departure_and_duration_segments.csv → .../tour_departure_and_duration_segments.csv b/.../tour_departure_and_duration_segments.csv → .../tour_departure_and_duration_segments.csv
diff --git a/...ample_semcog/configs/tour_mode_choice.csv → ...ction_semcog/configs/tour_mode_choice.csv b/...ample_semcog/configs/tour_mode_choice.csv → ...ction_semcog/configs/tour_mode_choice.csv
diff --git a/...mple_semcog/configs/tour_mode_choice.yaml → ...tion_semcog/configs/tour_mode_choice.yaml b/...mple_semcog/configs/tour_mode_choice.yaml → ...tion_semcog/configs/tour_mode_choice.yaml
@@ -53,17 +53,6 @@ COEFFICIENTS: tour_mode_choice_coeffs.csv
 COEFFICIENT_TEMPLATE: tour_mode_choice_coeffs_template.csv
 
 CONSTANTS:
-    # valueOfTime: 8.00
-    # costPerMile: 18.29
-    # costShareSr2: 1.75
-    # costShareSr3: 2.50
-    # waitThresh: 10.00
-    # walkThresh: 1.50
-    # shortWalk: 0.333
-    # longWalk: 0.667
-    # walkSpeed: 3.00
-    # bikeThresh: 6.00
-    # bikeSpeed: 12.00
     maxCbdAreaTypeThresh: 2
     indivTour: 1.00000
     upperEA: 5
@@ -166,11 +155,6 @@ CONSTANTS:
       8: 1.0
     transit_subsidy_fare_discount_percent_worktour: 0.9
 
-#    joint_sr2_ASC_no_auto: 0
-#    joint_sr2_ASC_auto_deficient: 0
-#    joint_sr2_ASC_auto_sufficient: 0
-#    joint_drive_transit_ASC_no_auto: 0
-
 # so far, we can use the same spec as for non-joint tours
 preprocessor:
   SPEC: tour_mode_choice_annotate_choosers_preprocessor

diff --git a/...choice_annotate_choosers_preprocessor.csv → ...choice_annotate_choosers_preprocessor.csv b/...choice_annotate_choosers_preprocessor.csv → ...choice_annotate_choosers_preprocessor.csv
diff --git a/...emcog/configs/tour_mode_choice_coeffs.csv → ...emcog/configs/tour_mode_choice_coeffs.csv b/...emcog/configs/tour_mode_choice_coeffs.csv → ...emcog/configs/tour_mode_choice_coeffs.csv
diff --git a/...mcog/configs/tour_mode_choice_coeffs_.csv → ...mcog/configs/tour_mode_choice_coeffs_.csv b/...mcog/configs/tour_mode_choice_coeffs_.csv → ...mcog/configs/tour_mode_choice_coeffs_.csv
diff --git a/...g/configs/tour_mode_choice_coeffs_old.csv → ...g/configs/tour_mode_choice_coeffs_old.csv b/...g/configs/tour_mode_choice_coeffs_old.csv → ...g/configs/tour_mode_choice_coeffs_old.csv
diff --git a/...figs/tour_mode_choice_coeffs_template.csv → ...figs/tour_mode_choice_coeffs_template.csv b/...figs/tour_mode_choice_coeffs_template.csv → ...figs/tour_mode_choice_coeffs_template.csv
diff --git a/...semcog/configs/tour_scheduling_atwork.csv → ...semcog/configs/tour_scheduling_atwork.csv b/...semcog/configs/tour_scheduling_atwork.csv → ...semcog/configs/tour_scheduling_atwork.csv
diff --git a/...emcog/configs/tour_scheduling_atwork.yaml → ...emcog/configs/tour_scheduling_atwork.yaml b/...emcog/configs/tour_scheduling_atwork.yaml → ...emcog/configs/tour_scheduling_atwork.yaml
diff --git a/...configs/tour_scheduling_atwork_coeffs.csv → ...configs/tour_scheduling_atwork_coeffs.csv b/...configs/tour_scheduling_atwork_coeffs.csv → ...configs/tour_scheduling_atwork_coeffs.csv
diff --git a/...s/tour_scheduling_atwork_preprocessor.csv → ...s/tour_scheduling_atwork_preprocessor.csv b/...s/tour_scheduling_atwork_preprocessor.csv → ...s/tour_scheduling_atwork_preprocessor.csv
diff --git a/..._semcog/configs/tour_scheduling_joint.csv → ..._semcog/configs/tour_scheduling_joint.csv b/..._semcog/configs/tour_scheduling_joint.csv → ..._semcog/configs/tour_scheduling_joint.csv
diff --git a/.../configs/tour_scheduling_joint_coeffs.csv → .../configs/tour_scheduling_joint_coeffs.csv b/.../configs/tour_scheduling_joint_coeffs.csv → .../configs/tour_scheduling_joint_coeffs.csv
diff --git a/.../configs/tour_scheduling_nonmandatory.csv → .../configs/tour_scheduling_nonmandatory.csv b/.../configs/tour_scheduling_nonmandatory.csv → .../configs/tour_scheduling_nonmandatory.csv
diff --git a/...s/tour_scheduling_nonmandatory_coeffs.csv → ...s/tour_scheduling_nonmandatory_coeffs.csv b/...s/tour_scheduling_nonmandatory_coeffs.csv → ...s/tour_scheduling_nonmandatory_coeffs.csv
diff --git a/...s/tour_scheduling_nonmandatory_eatout.csv → ...s/tour_scheduling_nonmandatory_eatout.csv b/...s/tour_scheduling_nonmandatory_eatout.csv → ...s/tour_scheduling_nonmandatory_eatout.csv
diff --git a/...ling_nonmandatory_eatout_coefficients.csv → ...ling_nonmandatory_eatout_coefficients.csv b/...ling_nonmandatory_eatout_coefficients.csv → ...ling_nonmandatory_eatout_coefficients.csv
diff --git a/...s/tour_scheduling_nonmandatory_escort.csv → ...s/tour_scheduling_nonmandatory_escort.csv b/...s/tour_scheduling_nonmandatory_escort.csv → ...s/tour_scheduling_nonmandatory_escort.csv
diff --git a/...ling_nonmandatory_escort_coefficients.csv → ...ling_nonmandatory_escort_coefficients.csv b/...ling_nonmandatory_escort_coefficients.csv → ...ling_nonmandatory_escort_coefficients.csv
diff --git a/...tour_scheduling_nonmandatory_othdiscr.csv → ...tour_scheduling_nonmandatory_othdiscr.csv b/...tour_scheduling_nonmandatory_othdiscr.csv → ...tour_scheduling_nonmandatory_othdiscr.csv
diff --git a/...ng_nonmandatory_othdiscr_coefficients.csv → ...ng_nonmandatory_othdiscr_coefficients.csv b/...ng_nonmandatory_othdiscr_coefficients.csv → ...ng_nonmandatory_othdiscr_coefficients.csv
diff --git a/...tour_scheduling_nonmandatory_othmaint.csv → ...tour_scheduling_nonmandatory_othmaint.csv b/...tour_scheduling_nonmandatory_othmaint.csv → ...tour_scheduling_nonmandatory_othmaint.csv
diff --git a/...ng_nonmandatory_othmaint_coefficients.csv → ...ng_nonmandatory_othmaint_coefficients.csv b/...ng_nonmandatory_othmaint_coefficients.csv → ...ng_nonmandatory_othmaint_coefficients.csv
diff --git a/...tour_scheduling_nonmandatory_shopping.csv → ...tour_scheduling_nonmandatory_shopping.csv b/...tour_scheduling_nonmandatory_shopping.csv → ...tour_scheduling_nonmandatory_shopping.csv
diff --git a/...ng_nonmandatory_shopping_coefficients.csv → ...ng_nonmandatory_shopping_coefficients.csv b/...ng_nonmandatory_shopping_coefficients.csv → ...ng_nonmandatory_shopping_coefficients.csv
diff --git a/...s/tour_scheduling_nonmandatory_social.csv → ...s/tour_scheduling_nonmandatory_social.csv b/...s/tour_scheduling_nonmandatory_social.csv → ...s/tour_scheduling_nonmandatory_social.csv
diff --git a/...ling_nonmandatory_social_coefficients.csv → ...ling_nonmandatory_social_coefficients.csv b/...ling_nonmandatory_social_coefficients.csv → ...ling_nonmandatory_social_coefficients.csv
diff --git a/...semcog/configs/tour_scheduling_school.csv → ...semcog/configs/tour_scheduling_school.csv b/...semcog/configs/tour_scheduling_school.csv → ...semcog/configs/tour_scheduling_school.csv
diff --git a/...configs/tour_scheduling_school_coeffs.csv → ...configs/tour_scheduling_school_coeffs.csv b/...configs/tour_scheduling_school_coeffs.csv → ...configs/tour_scheduling_school_coeffs.csv
diff --git a/...og/configs/tour_scheduling_university.csv → ...og/configs/tour_scheduling_university.csv b/...og/configs/tour_scheduling_university.csv → ...og/configs/tour_scheduling_university.csv
diff --git a/...igs/tour_scheduling_university_coeffs.csv → ...igs/tour_scheduling_university_coeffs.csv b/...igs/tour_scheduling_university_coeffs.csv → ...igs/tour_scheduling_university_coeffs.csv
diff --git a/...e_semcog/configs/tour_scheduling_work.csv → ...n_semcog/configs/tour_scheduling_work.csv b/...e_semcog/configs/tour_scheduling_work.csv → ...n_semcog/configs/tour_scheduling_work.csv
diff --git a/...g/configs/tour_scheduling_work_coeffs.csv → ...g/configs/tour_scheduling_work_coeffs.csv b/...g/configs/tour_scheduling_work_coeffs.csv → ...g/configs/tour_scheduling_work_coeffs.csv
diff --git a/...semcog/configs/transit_pass_ownership.csv → ...semcog/configs/transit_pass_ownership.csv b/...semcog/configs/transit_pass_ownership.csv → ...semcog/configs/transit_pass_ownership.csv
diff --git a/...emcog/configs/transit_pass_ownership.yaml → ...emcog/configs/transit_pass_ownership.yaml b/...emcog/configs/transit_pass_ownership.yaml → ...emcog/configs/transit_pass_ownership.yaml
diff --git a/...configs/transit_pass_ownership_coeffs.csv → ...configs/transit_pass_ownership_coeffs.csv b/...configs/transit_pass_ownership_coeffs.csv → ...configs/transit_pass_ownership_coeffs.csv
diff --git a/...e_semcog/configs/transit_pass_subsidy.csv → ...n_semcog/configs/transit_pass_subsidy.csv b/...e_semcog/configs/transit_pass_subsidy.csv → ...n_semcog/configs/transit_pass_subsidy.csv
diff --git a/..._semcog/configs/transit_pass_subsidy.yaml → ..._semcog/configs/transit_pass_subsidy.yaml b/..._semcog/configs/transit_pass_subsidy.yaml → ..._semcog/configs/transit_pass_subsidy.yaml
diff --git a/...g/configs/transit_pass_subsidy_coeffs.csv → ...g/configs/transit_pass_subsidy_coeffs.csv b/...g/configs/transit_pass_subsidy_coeffs.csv → ...g/configs/transit_pass_subsidy_coeffs.csv
diff --git a/...ample_semcog/configs/trip_destination.csv → ...ction_semcog/configs/trip_destination.csv b/...ample_semcog/configs/trip_destination.csv → ...ction_semcog/configs/trip_destination.csv
diff --git a/...mple_semcog/configs/trip_destination.yaml → ...tion_semcog/configs/trip_destination.yaml b/...mple_semcog/configs/trip_destination.yaml → ...tion_semcog/configs/trip_destination.yaml
diff --git a/...stination_annotate_trips_preprocessor.csv → ...stination_annotate_trips_preprocessor.csv b/...stination_annotate_trips_preprocessor.csv → ...stination_annotate_trips_preprocessor.csv
diff --git a/...configs/trip_destination_coefficients.csv → ...configs/trip_destination_coefficients.csv b/...configs/trip_destination_coefficients.csv → ...configs/trip_destination_coefficients.csv
diff --git a/...emcog/configs/trip_destination_sample.csv → ...emcog/configs/trip_destination_sample.csv b/...emcog/configs/trip_destination_sample.csv → ...emcog/configs/trip_destination_sample.csv
diff --git a/...ample_semcog/configs/trip_mode_choice.csv → ...ction_semcog/configs/trip_mode_choice.csv b/...ample_semcog/configs/trip_mode_choice.csv → ...ction_semcog/configs/trip_mode_choice.csv
diff --git a/...mple_semcog/configs/trip_mode_choice.yaml → ...tion_semcog/configs/trip_mode_choice.yaml b/...mple_semcog/configs/trip_mode_choice.yaml → ...tion_semcog/configs/trip_mode_choice.yaml
diff --git a/...mple_semcog/configs/trip_mode_choice_.csv → ...tion_semcog/configs/trip_mode_choice_.csv b/...mple_semcog/configs/trip_mode_choice_.csv → ...tion_semcog/configs/trip_mode_choice_.csv
diff --git a/...de_choice_annotate_trips_preprocessor.csv → ...de_choice_annotate_trips_preprocessor.csv b/...de_choice_annotate_trips_preprocessor.csv → ...de_choice_annotate_trips_preprocessor.csv
diff --git a/...configs/trip_mode_choice_coefficients.csv → ...configs/trip_mode_choice_coefficients.csv b/...configs/trip_mode_choice_coefficients.csv → ...configs/trip_mode_choice_coefficients.csv
diff --git a/...onfigs/trip_mode_choice_coefficients_.csv → ...onfigs/trip_mode_choice_coefficients_.csv b/...onfigs/trip_mode_choice_coefficients_.csv → ...onfigs/trip_mode_choice_coefficients_.csv
diff --git a/...rip_mode_choice_coefficients_template.csv → ...rip_mode_choice_coefficients_template.csv b/...rip_mode_choice_coefficients_template.csv → ...rip_mode_choice_coefficients_template.csv
diff --git a/...emcog/configs/trip_mode_choice_coeffs.csv → ...emcog/configs/trip_mode_choice_coeffs.csv b/...emcog/configs/trip_mode_choice_coeffs.csv → ...emcog/configs/trip_mode_choice_coeffs.csv
diff --git a/.../example_semcog/configs/trip_purpose.yaml → ...oduction_semcog/configs/trip_purpose.yaml b/.../example_semcog/configs/trip_purpose.yaml → ...oduction_semcog/configs/trip_purpose.yaml
diff --git a/...configs/trip_purpose_and_destination.yaml → ...configs/trip_purpose_and_destination.yaml b/...configs/trip_purpose_and_destination.yaml → ...configs/trip_purpose_and_destination.yaml
diff --git a/...p_purpose_annotate_trips_preprocessor.csv → ...p_purpose_annotate_trips_preprocessor.csv b/...p_purpose_annotate_trips_preprocessor.csv → ...p_purpose_annotate_trips_preprocessor.csv
diff --git a/...ple_semcog/configs/trip_purpose_probs.csv → ...ion_semcog/configs/trip_purpose_probs.csv b/...ple_semcog/configs/trip_purpose_probs.csv → ...ion_semcog/configs/trip_purpose_probs.csv
diff --git a/...ample_semcog/configs/trip_scheduling.yaml → ...ction_semcog/configs/trip_scheduling.yaml b/...ample_semcog/configs/trip_scheduling.yaml → ...ction_semcog/configs/trip_scheduling.yaml
diff --git a/..._semcog/configs/trip_scheduling_probs.csv → ..._semcog/configs/trip_scheduling_probs.csv b/..._semcog/configs/trip_scheduling_probs.csv → ..._semcog/configs/trip_scheduling_probs.csv
diff --git a/...gs/university_location_zone_override.yaml → ...gs/university_location_zone_override.yaml b/...gs/university_location_zone_override.yaml → ...gs/university_location_zone_override.yaml
diff --git a/...example_semcog/configs/work_from_home.csv → ...duction_semcog/configs/work_from_home.csv b/...example_semcog/configs/work_from_home.csv → ...duction_semcog/configs/work_from_home.csv
diff --git a/...xample_semcog/configs/work_from_home.yaml → ...uction_semcog/configs/work_from_home.yaml b/...xample_semcog/configs/work_from_home.yaml → ...uction_semcog/configs/work_from_home.yaml
diff --git a/..._semcog/configs/work_from_home_coeffs.csv → ..._semcog/configs/work_from_home_coeffs.csv b/..._semcog/configs/work_from_home_coeffs.csv → ..._semcog/configs/work_from_home_coeffs.csv
diff --git a/...ple_semcog/configs/workplace_location.csv → ...ion_semcog/configs/workplace_location.csv b/...ple_semcog/configs/workplace_location.csv → ...ion_semcog/configs/workplace_location.csv
diff --git a/...le_semcog/configs/workplace_location.yaml → ...on_semcog/configs/workplace_location.yaml b/...le_semcog/configs/workplace_location.yaml → ...on_semcog/configs/workplace_location.yaml
diff --git a/...cog/configs/workplace_location_coeffs.csv → ...cog/configs/workplace_location_coeffs.csv b/...cog/configs/workplace_location_coeffs.csv → ...cog/configs/workplace_location_coeffs.csv
diff --git a/...cog/configs/workplace_location_sample.csv → ...cog/configs/workplace_location_sample.csv b/...cog/configs/workplace_location_sample.csv → ...cog/configs/workplace_location_sample.csv
diff --git a/...e_semcog/configs/write_trip_matrices.yaml → ...n_semcog/configs/write_trip_matrices.yaml b/...e_semcog/configs/write_trip_matrices.yaml → ...n_semcog/configs/write_trip_matrices.yaml
diff --git a/..._matrices_annotate_trips_preprocessor.csv → ..._matrices_annotate_trips_preprocessor.csv b/..._matrices_annotate_trips_preprocessor.csv → ..._matrices_annotate_trips_preprocessor.csv
diff --git a/...es/example_semcog/configs_mp/logging.yaml → ...production_semcog/configs_mp/logging.yaml b/...es/example_semcog/configs_mp/logging.yaml → ...production_semcog/configs_mp/logging.yaml
diff --git a/...s/example_semcog/configs_mp/settings.yaml → ...roduction_semcog/configs_mp/settings.yaml b/...s/example_semcog/configs_mp/settings.yaml → ...roduction_semcog/configs_mp/settings.yaml
diff --git a/...ple_semcog/configs_mp/shadow_pricing.yaml → ...ion_semcog/configs_mp/shadow_pricing.yaml b/...ple_semcog/configs_mp/shadow_pricing.yaml → ...ion_semcog/configs_mp/shadow_pricing.yaml
diff --git a/...amples/example_semcog/data/households.csv → ...les/production_semcog/data/households.csv b/...amples/example_semcog/data/households.csv → ...les/production_semcog/data/households.csv
diff --git a/...examples/example_semcog/data/land_use.csv → ...mples/production_semcog/data/land_use.csv b/...examples/example_semcog/data/land_use.csv → ...mples/production_semcog/data/land_use.csv
diff --git a/...s/example_semcog/data/maz_to_maz_bike.csv → ...roduction_semcog/data/maz_to_maz_bike.csv b/...s/example_semcog/data/maz_to_maz_bike.csv → ...roduction_semcog/data/maz_to_maz_bike.csv
diff --git a/...s/example_semcog/data/maz_to_maz_walk.csv → ...roduction_semcog/data/maz_to_maz_walk.csv b/...s/example_semcog/data/maz_to_maz_walk.csv → ...roduction_semcog/data/maz_to_maz_walk.csv
diff --git a/...sim/examples/example_semcog/data/mazs.csv → .../examples/production_semcog/data/mazs.csv b/...sim/examples/example_semcog/data/mazs.csv → .../examples/production_semcog/data/mazs.csv
diff --git a/.../examples/example_semcog/data/persons.csv → ...amples/production_semcog/data/persons.csv b/.../examples/example_semcog/data/persons.csv → ...amples/production_semcog/data/persons.csv
diff --git a/...im/examples/example_semcog/data/skims.omx → ...examples/production_semcog/data/skims.omx b/...im/examples/example_semcog/data/skims.omx → ...examples/production_semcog/data/skims.omx
diff --git a/...ysim/examples/example_semcog/data/taz.csv → ...m/examples/production_semcog/data/taz.csv b/...ysim/examples/example_semcog/data/taz.csv → ...m/examples/production_semcog/data/taz.csv
diff --git a/...les/example_semcog/extensions/__init__.py → .../production_semcog/extensions/__init__.py b/...les/example_semcog/extensions/__init__.py → .../production_semcog/extensions/__init__.py
diff --git a/.../parking_location_choice_at_university.py → .../parking_location_choice_at_university.py b/.../parking_location_choice_at_university.py → .../parking_location_choice_at_university.py
diff --git a/...ions/stop_frequency_university_parking.py → ...ions/stop_frequency_university_parking.py b/...ions/stop_frequency_university_parking.py → ...ions/stop_frequency_university_parking.py
diff --git a/...ions/university_location_zone_override.py → ...ions/university_location_zone_override.py b/...ions/university_location_zone_override.py → ...ions/university_location_zone_override.py
diff --git a/...les/example_semcog/scripts/semcog_crop.py → .../production_semcog/scripts/semcog_crop.py b/...les/example_semcog/scripts/semcog_crop.py → .../production_semcog/scripts/semcog_crop.py
diff --git a/...sim/examples/example_semcog/simulation.py → .../examples/production_semcog/simulation.py b/...sim/examples/example_semcog/simulation.py → .../examples/production_semcog/simulation.py
diff --git a/...example_semcog/test/configs/settings.yaml → ...duction_semcog/test/configs/settings.yaml b/...example_semcog/test/configs/settings.yaml → ...duction_semcog/test/configs/settings.yaml
diff --git a/...e_semcog/test/configs_mp/network_los.yaml → ...n_semcog/test/configs_mp/network_los.yaml b/...e_semcog/test/configs_mp/network_los.yaml → ...n_semcog/test/configs_mp/network_los.yaml
diff --git a/...mple_semcog/test/configs_mp/settings.yaml → ...tion_semcog/test/configs_mp/settings.yaml b/...mple_semcog/test/configs_mp/settings.yaml → ...tion_semcog/test/configs_mp/settings.yaml
diff --git a/...om_home_annotate_persons_preprocessor.csv → ...om_home_annotate_persons_preprocessor.csv b/...om_home_annotate_persons_preprocessor.csv → ...om_home_annotate_persons_preprocessor.csv