calibrated cdap and non-mand tour destination

src/asim/configs/resident/cdap_indiv_and_hhsize1.csv

@@ -56,11 +56,11 @@ Retired weighted target ASC,ptype == 5,,-0.131,0.313
 Driving-age child who is in school weighted target ASC,ptype == 6,-0.134,0.314,0.026
 Pre-driving-age child who is in school weighted target ASC,ptype == 7,0.028,-0.084,0.010
 Preschool child weighted target ASC,ptype == 8,0.104,-0.223,0.116
-ABM3 calibration ASC ptype=1,ptype==1,0.5540,-0.218,-0.427
-ABM3 calibration ASC ptype=2,ptype==2,-0.107,0.0276,0.223
-ABM3 calibration ASC ptype=3,ptype==3,0.427,-0.198,-0.164
-ABM3 calibration ASC ptype=4,ptype==4,0.0,-0.029,0.0889
-ABM3 calibration ASC ptype=5,ptype==5,0.0,0.114,-0.227
-ABM3 calibration ASC ptype=6,ptype==6,3.650,-0.241,0.298
-ABM3 calibration ASC ptype=7,ptype==7,2.000,-0.171,0.096
-ABM3 calibration ASC ptype=8,ptype==8,0.436,0.454,-0.731
+ABM3 calibration ASC ptype=1,ptype==1,0.600,0.00,-0.527
+ABM3 calibration ASC ptype=2,ptype==2,-0.107,0.0276,0.190
+ABM3 calibration ASC ptype=3,ptype==3,0.427,-0.120,-0.200
+ABM3 calibration ASC ptype=4,ptype==4,0.0,0.00,0.0889
+ABM3 calibration ASC ptype=5,ptype==5,0.0,0.134,-0.227
+ABM3 calibration ASC ptype=6,ptype==6,3.750,-0.241,0.298
+ABM3 calibration ASC ptype=7,ptype==7,2.200,-0.171,0.096
+ABM3 calibration ASC ptype=8,ptype==8,0.536,0.454,-0.731

src/asim/configs/resident/non_mandatory_tour_destination.csv

@@ -66,7 +66,9 @@ util_indiv_0_2_ASC,indiv tours in 0_2bin calibration constant,"@(_DIST.between(0
 util_indiv_2_5_ASC,indiv tours in 2_5bin calibration constant,"@(_DIST.between(2,5)) * (df.get('tour_category', default=False) != 'joint')",coef_abm3_dist_2_5indivescort_asc,coef_abm3_dist_2_5indivmaint_asc,coef_abm3_dist_2_5indivdisc_asc,coef_abm3_dist_2_5indivmaint_asc,coef_abm3_dist_2_5indivdisc_asc,coef_abm3_dist_2_5indivdisc_asc
 util_indiv_5_10_ASC,indiv tours in 5_10bin calibration constant,"@(_DIST.between(5,10)) * (df.get('tour_category', default=False) != 'joint')",coef_abm3_dist_5_10indivescort_asc,coef_abm3_dist_5_10indivmaint_asc,coef_abm3_dist_5_10indivdisc_asc,coef_abm3_dist_5_10indivmaint_asc,coef_abm3_dist_5_10indivdisc_asc,coef_abm3_dist_5_10indivdisc_asc
 util_indiv_10_30_ASC,indiv tours in 10_30bin calibration constant,"@(_DIST.between(10,30)) * (df.get('tour_category', default=False) != 'joint')",coef_abm3_dist_10_30indivescort_asc,coef_abm3_dist_10_30indivmaint_asc,coef_abm3_dist_10_30indivdisc_asc,coef_abm3_dist_10_30indivmaint_asc,coef_abm3_dist_10_30indivdisc_asc,coef_abm3_dist_10_30indivdisc_asc
+util_indiv_dist_ASC,indiv tours in distance calibration constant,"@(_DIST) * (df.get('tour_category', default=False) != 'joint')",,0.05,,0.05,,
 util_joint_0_2_ASC,joint tours in 0_2bin calibration constant,"@(_DIST.between(0,2)) * (df.get('tour_category', default=False) == 'joint')",,coef_abm3_dist_0_2jointmaint_asc,coef_abm3_dist_0_2jointdisc_asc,coef_abm3_dist_0_2jointmaint_asc,coef_abm3_dist_0_2jointdisc_asc,coef_abm3_dist_0_2jointdisc_asc
 util_joint_2_5_ASC,joint tours in 2_5bin calibration constant,"@(_DIST.between(2,5)) * (df.get('tour_category', default=False) == 'joint')",,coef_abm3_dist_2_5jointmaint_asc,coef_abm3_dist_2_5jointdisc_asc,coef_abm3_dist_2_5jointmaint_asc,coef_abm3_dist_2_5jointdisc_asc,coef_abm3_dist_2_5jointdisc_asc
 util_joint_5_10_ASC,joint tours in 5_10bin calibration constant,"@(_DIST.between(5,10)) * (df.get('tour_category', default=False) == 'joint')",,coef_abm3_dist_5_10jointmaint_asc,coef_abm3_dist_5_10jointdisc_asc,coef_abm3_dist_5_10jointmaint_asc,coef_abm3_dist_5_10jointdisc_asc,coef_abm3_dist_5_10jointdisc_asc
 util_joint_10_30_ASC,joint tours in 10_30bin calibration constant,"@(_DIST.between(10,30)) * (df.get('tour_category', default=False) == 'joint')",,coef_abm3_dist_10_30jointmaint_asc,coef_abm3_dist_10_30jointdisc_asc,coef_abm3_dist_10_30jointmaint_asc,coef_abm3_dist_10_30jointdisc_asc,coef_abm3_dist_10_30jointdisc_asc
+util_indiv_dist_ASC,indiv tours in distance calibration constant,"@(_DIST) * (df.get('tour_category', default=False) == 'joint')",,0.10,,0.10,,