Remove TNC access/egress skim times from MT/NEV access/egress time

src/asim/configs/crossborder/trip_mode_choice_annotate_trips_preprocessor.csv

@@ -120,42 +120,42 @@ nev direct time,nev_direct_time,"np.maximum(s3_dist_skims/nevSpeed*60, s3_time_s
 nev total time,nev_time,"np.maximum(nev_direct_time + nevDiversionConstant, nevDiversionFactor*nev_direct_time)"
 # Microtransit and NEV egress from transit,,
 outbound microtransit egress from premium available,microtransit_local_egress_available_out,df.outbound & (microtransit_dest>0) & (dest_micro_local_dist>maxWalkIfMTAccessAvailable) & (dest_micro_local_dist<microtransitMaxDist) & microtransit_operating
-outbound microtransit direct egress from premium time,microtransit_direct_local_egress_time_out,"np.maximum(dest_micro_local_dist/microtransitSpeed*60, odt_skims['TNCOUT_LOC_EGR'])"
+outbound microtransit direct egress from premium time,microtransit_direct_local_egress_time_out,"dest_micro_local_dist/microtransitSpeed*60"
 outbound microtransit egress from premium time,microtransit_local_egress_time_out,"microtransitWaitTime + np.maximum(microtransit_direct_local_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_local_egress_time_out)"
 inbound microtransit access to premium available,microtransit_local_access_available_in,~df.outbound & (microtransit_orig>0) & (origin_micro_local_dist>maxWalkIfMTAccessAvailable) & (origin_micro_local_dist<microtransitMaxDist) & microtransit_operating
-inbound microtransit direct access to premium time,microtransit_direct_local_access_time_in,"np.maximum(origin_micro_local_dist/microtransitSpeed*60, odt_skims['TNCIN_LOC_ACC'])"
+inbound microtransit direct access to premium time,microtransit_direct_local_access_time_in,"origin_micro_local_dist/microtransitSpeed*60"
 inbound microtransit access to premium time,microtransit_local_access_time_in,"microtransitWaitTime + np.maximum(microtransit_direct_local_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_local_access_time_in)"
 outbound nev egress from premium available,nev_local_egress_available_out,df.outbound & (nev_dest>0) & (dest_micro_local_dist>maxWalkIfMTAccessAvailable) & (dest_micro_local_dist<nevMaxDist) & nev_operating
-outbound nev direct egress from premium time,nev_direct_local_egress_time_out,"np.maximum(dest_micro_local_dist/nevSpeed*60, odt_skims['TNCOUT_LOC_EGR'])"
+outbound nev direct egress from premium time,nev_direct_local_egress_time_out,"dest_micro_local_dist/nevSpeed*60"
 outbound nev egress from premium time,nev_local_egress_time_out,"nevWaitTime + np.maximum(nev_direct_local_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_local_egress_time_out)"
 inbound nev access to premium available,nev_local_access_available_in,~df.outbound & (nev_orig>0) & (origin_micro_local_dist>maxWalkIfMTAccessAvailable) & (origin_micro_local_dist<nevMaxDist) & nev_operating
-inbound nev direct access to premium time,nev_direct_local_access_time_in,"np.maximum(origin_micro_local_dist/nevSpeed*60, odt_skims['TNCIN_LOC_ACC'])"
+inbound nev direct access to premium time,nev_direct_local_access_time_in,"origin_micro_local_dist/nevSpeed*60"
 inbound nev access to premium time,nev_local_access_time_in,"nevWaitTime + np.maximum(nev_direct_local_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_local_access_time_in)"
 #,,
 outbound microtransit egress from premium available,microtransit_prm_egress_available_out,df.outbound & (microtransit_dest>0) & (dest_micro_prm_dist>maxWalkIfMTAccessAvailable) & (dest_micro_prm_dist<microtransitMaxDist) & microtransit_operating
-outbound microtransit direct egress from premium time,microtransit_direct_prm_egress_time_out,"np.maximum(dest_micro_prm_dist/microtransitSpeed*60, odt_skims['TNCOUT_PRM_EGR'])"
+outbound microtransit direct egress from premium time,microtransit_direct_prm_egress_time_out,"dest_micro_prm_dist/microtransitSpeed*60"
 outbound microtransit egress from premium time,microtransit_prm_egress_time_out,"microtransitWaitTime + np.maximum(microtransit_direct_prm_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_prm_egress_time_out)"
 inbound microtransit access to premium available,microtransit_prm_access_available_in,~df.outbound & (microtransit_orig>0) & (origin_micro_prm_dist>maxWalkIfMTAccessAvailable) & (origin_micro_prm_dist<microtransitMaxDist) & microtransit_operating
-inbound microtransit direct access to premium time,microtransit_direct_prm_access_time_in,"np.maximum(origin_micro_prm_dist/microtransitSpeed*60, odt_skims['TNCIN_PRM_ACC'])"
+inbound microtransit direct access to premium time,microtransit_direct_prm_access_time_in,"origin_micro_prm_dist/microtransitSpeed*60"
 inbound microtransit access to premium time,microtransit_prm_access_time_in,"microtransitWaitTime + np.maximum(microtransit_direct_prm_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_prm_access_time_in)"
 outbound nev egress from premium available,nev_prm_egress_available_out,df.outbound & (nev_dest>0) & (dest_micro_prm_dist>maxWalkIfMTAccessAvailable) & (dest_micro_prm_dist<nevMaxDist) & nev_operating
-outbound nev direct egress from premium time,nev_direct_prm_egress_time_out,"np.maximum(dest_micro_prm_dist/nevSpeed*60, odt_skims['TNCOUT_PRM_EGR'])"
+outbound nev direct egress from premium time,nev_direct_prm_egress_time_out,"dest_micro_prm_dist/nevSpeed*60"
 outbound nev egress from premium time,nev_prm_egress_time_out,"nevWaitTime + np.maximum(nev_direct_prm_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_prm_egress_time_out)"
 inbound nev access to premium available,nev_prm_access_available_in,~df.outbound & (nev_orig>0) & (origin_micro_prm_dist>maxWalkIfMTAccessAvailable) & (origin_micro_prm_dist<nevMaxDist) & nev_operating
-inbound nev direct access to premium time,nev_direct_prm_access_time_in,"np.maximum(origin_micro_prm_dist/nevSpeed*60, odt_skims['TNCIN_PRM_ACC'])"
+inbound nev direct access to premium time,nev_direct_prm_access_time_in,"origin_micro_prm_dist/nevSpeed*60"
 inbound nev access to premium time,nev_prm_access_time_in,"nevWaitTime + np.maximum(nev_direct_prm_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_prm_access_time_in)"
 #,,
 outbound microtransit egress from premium available,microtransit_mix_egress_available_out,df.outbound & (microtransit_dest>0) & (dest_micro_mix_dist>maxWalkIfMTAccessAvailable) & (dest_micro_mix_dist<microtransitMaxDist) & microtransit_operating
-outbound microtransit direct egress from premium time,microtransit_direct_mix_egress_time_out,"np.maximum(dest_micro_mix_dist/microtransitSpeed*60, odt_skims['TNCOUT_MIX_EGR'])"
+outbound microtransit direct egress from premium time,microtransit_direct_mix_egress_time_out,"dest_micro_mix_dist/microtransitSpeed*60"
 outbound microtransit egress from premium time,microtransit_mix_egress_time_out,"microtransitWaitTime + np.maximum(microtransit_direct_mix_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_mix_egress_time_out)"
 inbound microtransit access to premium available,microtransit_mix_access_available_in,~df.outbound & (microtransit_orig>0) & (origin_micro_mix_dist>maxWalkIfMTAccessAvailable) & (origin_micro_mix_dist<microtransitMaxDist) & microtransit_operating
-inbound microtransit direct access to premium time,microtransit_direct_mix_access_time_in,"np.maximum(origin_micro_mix_dist/microtransitSpeed*60, odt_skims['TNCIN_MIX_ACC'])"
+inbound microtransit direct access to premium time,microtransit_direct_mix_access_time_in,"origin_micro_mix_dist/microtransitSpeed*60"
 inbound microtransit access to premium time,microtransit_mix_access_time_in,"microtransitWaitTime + np.maximum(microtransit_direct_mix_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_direct_mix_access_time_in)"
 outbound nev egress from premium available,nev_mix_egress_available_out,df.outbound & (nev_dest>0) & (dest_micro_mix_dist>maxWalkIfMTAccessAvailable) & (dest_micro_mix_dist<nevMaxDist) & nev_operating
-outbound nev direct egress from premium time,nev_direct_mix_egress_time_out,"np.maximum(dest_micro_mix_dist/nevSpeed*60, odt_skims['TNCOUT_MIX_EGR'])"
+outbound nev direct egress from premium time,nev_direct_mix_egress_time_out,"dest_micro_mix_dist/nevSpeed*60"
 outbound nev egress from premium time,nev_mix_egress_time_out,"nevWaitTime + np.maximum(nev_direct_mix_egress_time_out + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_mix_egress_time_out)"
 inbound nev access to premium available,nev_mix_access_available_in,~df.outbound & (nev_orig>0) & (origin_micro_mix_dist>maxWalkIfMTAccessAvailable) & (origin_micro_mix_dist<nevMaxDist) & nev_operating
-inbound nev direct access to premium time,nev_direct_mix_access_time_in,"np.maximum(origin_micro_mix_dist/nevSpeed*60, odt_skims['TNCIN_MIX_ACC'])"
+inbound nev direct access to premium time,nev_direct_mix_access_time_in,"origin_micro_mix_dist/nevSpeed*60"
 inbound nev access to premium time,nev_mix_access_time_in,"nevWaitTime + np.maximum(nev_direct_mix_access_time_in + microtransitDiversionConstant, microtransitDiversionFactor*nev_direct_mix_access_time_in)"
 # Additional transfers from microtransit and NEV,,
 microtransit/nev access transfer,mtnev_acc_xfer_in,microtransit_local_access_available_in | microtransit_prm_access_available_in | microtransit_mix_access_available_in | nev_local_access_available_in | nev_prm_access_available_in | nev_mix_access_available_in

src/asim/configs/resident/tour_mode_choice_annotate_choosers_preprocessor.csv

@@ -287,45 +287,45 @@ nev direct time,nev_direct_time,"np.maximum(s3_dist_skims_out/nevSpeed*60, s3_ti
 nev total time,nev_time,"np.maximum(nev_direct_time + nevDiversionConstant, nevDiversionFactor*nev_direct_time)",
 # Microtransit and NEV access to transit,,,
 microtransit access to local available,microtransit_local_access_available,(microtransit_orig>0) & (origin_micro_local_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct access to local time,microtransit_local_direct_access_time,"np.maximum(origin_micro_local_dist/microtransitSpeed*60, odt_skims['TNCOUT_LOC_ACC']) + np.maximum(origin_micro_local_dist/microtransitSpeed*60, dot_skims['TNCIN_LOC_EGR'])",
+microtransit direct access to local time,microtransit_local_direct_access_time,"(origin_micro_local_dist/microtransitSpeed*60) + (origin_micro_local_dist/microtransitSpeed*60)",
 microtransit access to local time,microtransit_local_access_time,"2*microtransitWaitTime + np.maximum(microtransit_local_direct_access_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_local_direct_access_time)",
 nev access to local available,nev_local_access_available,(nev_orig>0) & (origin_micro_local_dist<nevMaxDist) & nev_operating,
-nev direct access to local time,nev_local_direct_access_time,"np.maximum(origin_micro_local_dist/nevSpeed*60, odt_skims['TNCOUT_LOC_ACC']) + np.maximum(origin_micro_local_dist/nevSpeed*60, dot_skims['TNCIN_LOC_EGR'])",
+nev direct access to local time,nev_local_direct_access_time,"(origin_micro_local_dist/nevSpeed*60) + (origin_micro_local_dist/nevSpeed*60)",
 nev access to local time,nev_local_access_time,"2*nevWaitTime + np.maximum(nev_local_direct_access_time + nevDiversionConstant, nevDiversionFactor*nev_local_direct_access_time)",
 #,,,
 microtransit access to premium available,microtransit_prm_access_available,(microtransit_orig>0) & (origin_micro_prm_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct access to premium time,microtransit_prm_direct_access_time,"np.maximum(origin_micro_prm_dist/microtransitSpeed*60, odt_skims['TNCOUT_PRM_ACC']) + np.maximum(origin_micro_prm_dist/microtransitSpeed*60, dot_skims['TNCIN_PRM_EGR'])",
+microtransit direct access to premium time,microtransit_prm_direct_access_time,"(origin_micro_prm_dist/microtransitSpeed*60) + (origin_micro_prm_dist/microtransitSpeed*60)",
 microtransit access to premium time,microtransit_prm_access_time,"2*microtransitWaitTime + np.maximum(microtransit_prm_direct_access_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_prm_direct_access_time)",
 nev access to premium available,nev_prm_access_available,(nev_orig>0) & (origin_micro_prm_dist<nevMaxDist) & nev_operating,
-nev direct access to premium time,nev_prm_direct_access_time,"np.maximum(origin_micro_prm_dist/nevSpeed*60, odt_skims['TNCOUT_PRM_ACC']) + np.maximum(origin_micro_prm_dist/nevSpeed*60, dot_skims['TNCIN_PRM_EGR'])",
+nev direct access to premium time,nev_prm_direct_access_time,"(origin_micro_prm_dist/nevSpeed*60) + (origin_micro_prm_dist/nevSpeed*60)",
 nev access to premium time,nev_prm_access_time,"2*nevWaitTime + np.maximum(nev_prm_direct_access_time + nevDiversionConstant, nevDiversionFactor*nev_prm_direct_access_time)",
 #,,,
 microtransit access to mixed available,microtransit_mix_access_available,(microtransit_orig>0) & (origin_micro_mix_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct access to mixed time,microtransit_mix_direct_access_time,"np.maximum(origin_micro_mix_dist/microtransitSpeed*60, odt_skims['TNCOUT_MIX_ACC']) + np.maximum(origin_micro_mix_dist/microtransitSpeed*60, dot_skims['TNCIN_MIX_EGR'])",
+microtransit direct access to mixed time,microtransit_mix_direct_access_time,"(origin_micro_mix_dist/microtransitSpeed*60) + (origin_micro_mix_dist/microtransitSpeed*60)",
 microtransit access to mixed time,microtransit_mix_access_time,"2*microtransitWaitTime + np.maximum(microtransit_mix_direct_access_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_mix_direct_access_time)",
 nev access to mixed available,nev_mix_access_available,(nev_orig>0) & (origin_micro_mix_dist<nevMaxDist) & nev_operating,
-nev direct access to mixed time,nev_mix_direct_access_time,"np.maximum(origin_micro_mix_dist/nevSpeed*60, odt_skims['TNCOUT_MIX_ACC']) + np.maximum(origin_micro_mix_dist/nevSpeed*60, dot_skims['TNCIN_MIX_EGR'])",
+nev direct access to mixed time,nev_mix_direct_access_time,"(origin_micro_mix_dist/nevSpeed*60) + (origin_micro_mix_dist/nevSpeed*60)",
 nev access to mixed time,nev_mix_access_time,"2*nevWaitTime + np.maximum(nev_mix_direct_access_time + nevDiversionConstant, nevDiversionFactor*nev_mix_direct_access_time)",
 # Microtransit and NEV egress from transit,,,
 microtransit egress from local available,microtransit_local_egress_available,(microtransit_dest>0) & (dest_micro_local_dist>maxWalkIfMTAccessAvailable) & (dest_micro_local_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct egress from local time,microtransit_local_direct_egress_time,"np.maximum(dest_micro_local_dist/microtransitSpeed*60, odt_skims['TNCOUT_LOC_EGR']) + np.maximum(dest_micro_local_dist/microtransitSpeed*60, dot_skims['TNCIN_LOC_ACC'])",
+microtransit direct egress from local time,microtransit_local_direct_egress_time,"(dest_micro_local_dist/microtransitSpeed*60) + (dest_micro_local_dist/microtransitSpeed*60)",
 microtransit egress from local time,microtransit_local_egress_time,"2*microtransitWaitTime + np.maximum(microtransit_local_direct_egress_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_local_direct_egress_time)",
 nev egress from local available,nev_local_egress_available,(nev_dest>0) & (dest_micro_local_dist>maxWalkIfMTAccessAvailable) & (dest_micro_local_dist<nevMaxDist) & nev_operating,
-nev direct egress from local time,nev_local_direct_egress_time,"np.maximum(dest_micro_local_dist/nevSpeed*60, odt_skims['TNCOUT_LOC_EGR']) + np.maximum(dest_micro_local_dist/nevSpeed*60, dot_skims['TNCIN_LOC_ACC'])",
+nev direct egress from local time,nev_local_direct_egress_time,"(dest_micro_local_dist/nevSpeed*60) + (dest_micro_local_dist/nevSpeed*60)",
 nev egress from local time,nev_local_egress_time,"2*microtransitWaitTime + np.maximum(nev_local_direct_egress_time + nevDiversionConstant, nevDiversionFactor*nev_local_direct_egress_time)",
 #,,,
 microtransit egress from premium available,microtransit_prm_egress_available,(microtransit_dest>0) & (dest_micro_prm_dist>maxWalkIfMTAccessAvailable) & (dest_micro_prm_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct egress from premium time,microtransit_prm_direct_egress_time,"np.maximum(dest_micro_prm_dist/microtransitSpeed*60, odt_skims['TNCOUT_PRM_EGR']) + np.maximum(dest_micro_prm_dist/microtransitSpeed*60, dot_skims['TNCIN_PRM_ACC'])",
+microtransit direct egress from premium time,microtransit_prm_direct_egress_time,"(dest_micro_prm_dist/microtransitSpeed*60) + (dest_micro_prm_dist/microtransitSpeed*60)",
 microtransit egress from premium time,microtransit_prm_egress_time,"2*microtransitWaitTime + np.maximum(microtransit_prm_direct_egress_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_prm_direct_egress_time)",
 nev egress from premium available,nev_prm_egress_available,(nev_dest>0) & (dest_micro_prm_dist>maxWalkIfMTAccessAvailable) & (dest_micro_prm_dist<nevMaxDist) & nev_operating,
-nev direct egress from premium time,nev_prm_direct_egress_time,"np.maximum(dest_micro_prm_dist/nevSpeed*60, odt_skims['TNCOUT_PRM_EGR']) + np.maximum(dest_micro_prm_dist/nevSpeed*60, dot_skims['TNCIN_PRM_ACC'])",
+nev direct egress from premium time,nev_prm_direct_egress_time,"(dest_micro_prm_dist/nevSpeed*60) + (dest_micro_prm_dist/nevSpeed*60)",
 nev egress from premium time,nev_prm_egress_time,"2*microtransitWaitTime + np.maximum(nev_prm_direct_egress_time + nevDiversionConstant, nevDiversionFactor*nev_prm_direct_egress_time)",
 #,,,
 microtransit egress from mixed available,microtransit_mix_egress_available,(microtransit_dest>0) & (dest_micro_mix_dist>maxWalkIfMTAccessAvailable) & (dest_micro_mix_dist<microtransitMaxDist) & microtransit_operating,
-microtransit direct egress from mixed time,microtransit_mix_direct_egress_time,"np.maximum(dest_micro_mix_dist/microtransitSpeed*60, odt_skims['TNCOUT_MIX_EGR']) + np.maximum(dest_micro_mix_dist/microtransitSpeed*60, dot_skims['TNCIN_MIX_ACC'])",
+microtransit direct egress from mixed time,microtransit_mix_direct_egress_time,"(dest_micro_mix_dist/microtransitSpeed*60) + (dest_micro_mix_dist/microtransitSpeed*60)",
 microtransit egress from mixed time,microtransit_mix_egress_time,"2*microtransitWaitTime + np.maximum(microtransit_mix_direct_egress_time + microtransitDiversionConstant, microtransitDiversionFactor*microtransit_mix_direct_egress_time)",
 nev egress from mixed available,nev_mix_egress_available,(nev_dest>0) & (dest_micro_mix_dist>maxWalkIfMTAccessAvailable) & (dest_micro_mix_dist<nevMaxDist) & nev_operating,
-nev direct egress from mixed time,nev_mix_direct_egress_time,"np.maximum(dest_micro_mix_dist/nevSpeed*60, odt_skims['TNCOUT_MIX_EGR']) + np.maximum(dest_micro_mix_dist/nevSpeed*60, dot_skims['TNCIN_MIX_ACC'])",
+nev direct egress from mixed time,nev_mix_direct_egress_time,"(dest_micro_mix_dist/nevSpeed*60) + (dest_micro_mix_dist/nevSpeed*60)",
 nev egress from mixed time,nev_mix_egress_time,"2*microtransitWaitTime + np.maximum(nev_mix_direct_egress_time + nevDiversionConstant, nevDiversionFactor*nev_mix_direct_egress_time)",
 # Additional transfers from microtransit and NEV,,,
 microtransit/nev access transfer,mtnev_acc_xfer,microtransit_local_access_available | microtransit_prm_access_available | microtransit_mix_access_available | nev_local_access_available | nev_prm_access_available | nev_mix_access_available,