Corrected fuel type codes in expressions for EV calibration factors i…

…n vehicle type choice spec file
SANDAG · May 17, 2024 · de93ab3 · de93ab3
1 parent 4c47577
commit de93ab3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/asim/configs/resident/vehicle_type_choice_op4.csv b/src/asim/configs/resident/vehicle_type_choice_op4.csv
@@ -151,9 +151,9 @@ util_san_hyb,San Diego - Hybrid,"@(df.SAN) & (df.fuel_type_num_coded==4)",coef_s
 util_san_ev,San Diego - Electric,"@(df.SAN) & ((df.fuel_type_num_coded==5) | (df.fuel_type_num_coded==1))",coef_san_ev
 util_san_age,San Diego - Age,"@(df.SAN) * df.age",coef_san_age
 #,EV calibration constants,,
-util_calib_pev_2022,PEV calibration factor for 2022,"@(df.fuel_type_num_coded==1)*np.maximum(1 + (2022-scenarioYear)/(2035-2022), 0)",coef_calib_pev_2022
-util_calib_bev_2022,BEV calibration factor for 2022,"@(df.fuel_type_num_coded==5)*np.maximum(1 + (2022-scenarioYear)/(2035-2022), 0)",coef_calib_bev_2022
-util_calib_pev_2035,PEV calibration factor for 2035,"@(df.fuel_type_num_coded==1)*np.minimum((scenarioYear-2022)/(2035-2022), 1 + (2035-scenarioYear)/(2050-2035))",coef_calib_pev_2035
-util_calib_bev_2035,BEV calibration factor for 2035,"@(df.fuel_type_num_coded==5)*np.minimum((scenarioYear-2022)/(2035-2022), 1 + (2035-scenarioYear)/(2050-2035))",coef_calib_bev_2035
-util_calib_pev_2050,PEV calibration factor for 2050,"@(df.fuel_type_num_coded==1)*np.maximum((scenarioYear-2035)/(2050-2035), 0)",coef_calib_pev_2050
-util_calib_bev_2050,BEV calibration factor for 2050,"@(df.fuel_type_num_coded==5)*np.maximum((scenarioYear-2035)/(2050-2035), 0)",coef_calib_bev_2050
+util_calib_pev_2022,PEV calibration factor for 2022,"@(df.fuel_type_num_coded==5)*np.maximum(1 + (2022-scenarioYear)/(2035-2022), 0)",coef_calib_pev_2022
+util_calib_bev_2022,BEV calibration factor for 2022,"@(df.fuel_type_num_coded==1)*np.maximum(1 + (2022-scenarioYear)/(2035-2022), 0)",coef_calib_bev_2022
+util_calib_pev_2035,PEV calibration factor for 2035,"@(df.fuel_type_num_coded==5)*np.minimum((scenarioYear-2022)/(2035-2022), 1 + (2035-scenarioYear)/(2050-2035))",coef_calib_pev_2035
+util_calib_bev_2035,BEV calibration factor for 2035,"@(df.fuel_type_num_coded==1)*np.minimum((scenarioYear-2022)/(2035-2022), 1 + (2035-scenarioYear)/(2050-2035))",coef_calib_bev_2035
+util_calib_pev_2050,PEV calibration factor for 2050,"@(df.fuel_type_num_coded==5)*np.maximum((scenarioYear-2035)/(2050-2035), 0)",coef_calib_pev_2050
+util_calib_bev_2050,BEV calibration factor for 2050,"@(df.fuel_type_num_coded==1)*np.maximum((scenarioYear-2035)/(2050-2035), 0)",coef_calib_bev_2050