Merge pull request #148 from SANDAG/ABM3_develop_tnc_shared_fix

Fix TNC_SHARED mode share

src/asim/configs/resident/tour_mode_choice_coefficients.csv

@@ -676,7 +676,7 @@ coef_calib_autodeficienthhjoi_KNR_TRANSIT_maint,-56.88159968,F
 coef_calib_autodeficienthhjoi_TNC_TRANSIT_maint,-999.0,F
 coef_calib_autodeficienthhjoi_TAXI_maint,-54.97066616,F
 coef_calib_autodeficienthhjoi_TNC_SINGLE_maint,-56.97066616,F
-coef_calib_autodeficienthhjoi_TNC_SHARED_maint,-48.97066616,F
+coef_calib_autodeficienthhjoi_TNC_SHARED_maint,-56.97066616,F
 coef_calib_autodeficienthhjoi_EBIKE_maint,-52.4293596,F
 coef_calib_autodeficienthhjoi_ESCOOTER_maint,-50.0,F
 #coef_calib_autosufficienthhjo_SHARED2_maint,4.253195896,F
@@ -716,7 +716,7 @@ coef_calib_autodeficienthhjoi_KNR_TRANSIT_disc,-53.12678499,F
 coef_calib_autodeficienthhjoi_TNC_TRANSIT_disc,-999.0,F
 coef_calib_autodeficienthhjoi_TAXI_disc,-52.71598351,F
 coef_calib_autodeficienthhjoi_TNC_SINGLE_disc,-54.71598351,F
-coef_calib_autodeficienthhjoi_TNC_SHARED_disc,-46.71598351,F
+coef_calib_autodeficienthhjoi_TNC_SHARED_disc,-54.71598351,F
 coef_calib_autodeficienthhjoi_EBIKE_disc,-52.4293596,F
 coef_calib_autodeficienthhjoi_ESCOOTER_disc,-50.0,F
 #coef_calib_autosufficienthhjo_SHARED2_disc,4.253195896,F

src/asim/configs/resident/trip_mode_choice.csv

@@ -401,7 +401,7 @@ util_TNC Single - In-vehicle time,TNC Single - In-vehicle time,(s2_time_skims) *
 util_TNC Single - Wait time,TNC Single - Wait time,origSingleTNCWaitTime *  time_factor,,,,,,,,,,,,,,,,,,,coef_wait,,,,
 util_TNC Single - Cost,TNC Single - Cost,"@((np.maximum(TNC_single_baseFare + df.s2_dist_skims * TNC_single_costPerMile + df.s2_time_skims * TNC_single_costPerMinute, TNC_single_costMinimum) * 100 + df.s2_cost_skims)) / (np.maximum(df.income,1000)**df.income_exponent)",,,,,,,,,,,,,,,,,,,coef_income,,,,
 #,TNC Shared,,,,,,,,,,,,,,,,,,,,,,,,
-util_TNC Shared_switch,TNC Shared - switch turn-off (depends on data availability),@((~df.nev_available) & (~df.microtransit_available) & (scenarioYear==2022)),,,,,,,,,,,,,,,,,,,,-999,,,
+util_TNC Shared_switch,TNC Shared - switch turn-off (depends on data availability),@(((~df.nev_available) & (~df.microtransit_available) & (scenarioYear==2022)) | df.RideHail_available==0),,,,,,,,,,,,,,,,,,,,-999,,,
 util_TNC Shared - In-vehicle time,TNC Shared - In-vehicle time,"@(np.where(df.nev_available, df.nev_time, np.where(df.microtransit_available, df.microtransit_time, df.s3_time_skims))) * TNC_shared_IVTFactor * df.time_factor",,,,,,,,,,,,,,,,,,,,coef_ivt,,,
 util_TNC Shared - Wait time,TNC Shared - Wait time,"@np.where(df.nev_available, nevWaitTime, np.where(df.microtransit_available, microtransitWaitTime, df.origSharedTNCWaitTime)) * df.time_factor",,,,,,,,,,,,,,,,,,,,coef_wait,,,
 util_TNC Shared - Cost,TNC Shared - Cost,"@np.where(df.nev_available, nevCost, np.where(df.microtransit_available, microtransitCost, (np.maximum(TNC_shared_baseFare + df.s3_dist_skims * TNC_shared_costPerMile + df.s3_time_skims * TNC_shared_costPerMinute, TNC_shared_costMinimum) * 100 + df.s3_cost_skims))) / (np.maximum(df.income,1000)**df.income_exponent)",,,,,,,,,,,,,,,,,,,,coef_income,,,