Merge pull request #213 from SANDAG/vot_cleanup

Some config cleanup
SANDAG · Oct 11, 2024 · 3528a57 · 3528a57
2 parents 2d88985 + b62df39
commit 3528a57
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 65 deletions.
diff --git a/src/asim/configs/airport.CBX/trip_mode_choice.yaml b/src/asim/configs/airport.CBX/trip_mode_choice.yaml
@@ -250,8 +250,6 @@ CONSTANTS:
   ivt_hvy_multiplier: 0.80
   cost_share_s2: 2
   cost_share_s3: 3
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
   max_walk_time: 60
   eaperiod: 11
   amperiod: 17

diff --git a/src/asim/configs/airport.CBX/write_trip_matrices.yaml b/src/asim/configs/airport.CBX/write_trip_matrices.yaml
@@ -398,6 +398,4 @@ CONSTANTS:
       last_hour: 32
     EV:
       first_hour: 33
-      last_hour: 48
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
+      last_hour: 48
diff --git a/src/asim/configs/airport.SAN/trip_mode_choice.yaml b/src/asim/configs/airport.SAN/trip_mode_choice.yaml
@@ -251,8 +251,6 @@ CONSTANTS:
   ivt_hvy_multiplier: 0.80
   cost_share_s2: 2
   cost_share_s3: 3
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
   max_walk_time: 60
   eaperiod: 11
   amperiod: 17

diff --git a/src/asim/configs/airport.SAN/write_trip_matrices.yaml b/src/asim/configs/airport.SAN/write_trip_matrices.yaml
@@ -398,6 +398,4 @@ CONSTANTS:
       last_hour: 32
     EV:
       first_hour: 33
-      last_hour: 48
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
+      last_hour: 48
diff --git a/src/asim/configs/common_airport/constants.yaml b/src/asim/configs/common_airport/constants.yaml
@@ -12,4 +12,6 @@ ivt_lrt_multiplier: 0.85
 ivt_brt_multiplier: 0.95
 ivt_cmr_multiplier: 0.85
 ivt_ltd_multiplier: 1.0
-ivt_cost_multiplier: 0.6
+ivt_cost_multiplier: 0.6
+vot_threshold_low: 8.81
+vot_threshold_med: 18.00
diff --git a/src/asim/configs/common_airport/initialize_tours.yaml b/src/asim/configs/common_airport/initialize_tours.yaml
@@ -10,6 +10,4 @@ annotate_tours:
 # any of the attributes that this method requires
 skip_patch_tour_ids: True
 
-CONSTANTS:
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
+CONSTANTS:
diff --git a/src/asim/configs/crossborder/trip_mode_choice.yaml b/src/asim/configs/crossborder/trip_mode_choice.yaml
@@ -39,14 +39,6 @@ CONSTANTS:
   time_distrib_stddev_work: 0.7
   time_distrib_mean_nonwork: 1.0
   time_distrib_stddev_nonwork: 0.6
-  work_dist_coef: -8.6
-  other_dist_coef: -4.9
-  vot_bin_idx_to_skim_label:
-    1: L
-    2: M
-    3: H
-  max_walk_time: 60
-  walkSpeed: 3.0
   tnc_shared_ivt_factor: 1.25
   tnc_single_wait_time_mean_by_density:
     1: 10.3

diff --git a/src/asim/configs/crossborder/write_trip_matrices.yaml b/src/asim/configs/crossborder/write_trip_matrices.yaml
@@ -439,13 +439,6 @@ CONSTANTS:
   time_distrib_stddEA_work: 0.7
   time_distrib_mean_nonwork: 1.0
   time_distrib_stddEA_nonwork: 0.6
-  work_dist_coef: -8.6
-  other_dist_coef: -4.9
-  vot_bin_idx_to_skim_label:
-    1: L
-    2: M
-    3: H
-  max_walk_time: 60
   tnc_shared_ivt_factor: 1.25
   tnc_single_wait_time_mean_by_density:
     1: 10.3

diff --git a/src/asim/configs/resident/write_trip_matrices.yaml b/src/asim/configs/resident/write_trip_matrices.yaml
@@ -493,6 +493,4 @@ CONSTANTS:
       last_hour: 32
     EV:
       first_hour: 33
-      last_hour: 48
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
+      last_hour: 48
diff --git a/src/asim/configs/visitor/trip_mode_choice.yaml b/src/asim/configs/visitor/trip_mode_choice.yaml
@@ -39,36 +39,6 @@ CONSTANTS:
   orig_col_name: origin
   dest_col_name: destination
   PERIODS_PER_HOUR: 2
-  time_distrib_mean_work: 1.0
-  time_distrib_stddev_work: 0.7
-  time_distrib_mean_nonwork: 1.0
-  time_distrib_stddev_nonwork: 0.6
-  cost_per_mile_fuel: 12.3  # from parametersByYear.csv, depends on simulation year
-  cost_per_mile_maint: 7  # from parametersByYear.csv, depends on simulation year
-  cost_share_s2: 2
-  cost_share_s3: 3
-  work_dist_coef: -8.6
-  other_dist_coef: -4.9
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
-  vot_bin_idx_to_skim_label:
-    1: L
-    2: M
-    3: H
-  max_walk_time: 60
-  max_bike_time: 60
-  taxi_base_fare: 2.20
-  taxi_cost_per_mile: 2.30
-  taxi_cost_per_minute: 0.10
-  tnc_single_base_fare: 2.20
-  tnc_single_cost_per_mile: 1.33
-  tnc_single_cost_per_minute: 0.24
-  tnc_single_cost_minimum: 7.20
-  tnc_shared_base_fare: 2.20
-  tnc_shared_cost_per_mile: 0.44
-  tnc_shared_cost_per_minute: 0.08
-  tnc_shared_cost_minimum: 3.00
-  tnc_shared_ivt_factor: 1.25
   tnc_single_wait_time_mean_by_density:
     1: 10.3
     2: 8.5

diff --git a/src/asim/configs/visitor/write_trip_matrices.yaml b/src/asim/configs/visitor/write_trip_matrices.yaml
@@ -403,6 +403,4 @@ CONSTANTS:
       last_hour: 32
     EV:
       first_hour: 33
-      last_hour: 48
-  vot_threshold_low: 8.81
-  vot_threshold_med: 18.00
+      last_hour: 48