revert changes to cdap

Author: i-am-sijia

configs/resident/cdap_fixed_relative_proportions.csv

@@ -1,8 +1,8 @@
 Description,Expression,M,N,H
-Full-time worker,(ptype == 1) & ~(work_from_home | is_telecommuting),0.79647,0.09368,0.10985
-Full-time worker,(ptype == 1) & (work_from_home | is_telecommuting),0,0.460276126,0.539723874
-Part-time worker,(ptype == 2) & ~(work_from_home | is_telecommuting),0.61678,0.25757,0.12565
-Part-time worker,(ptype == 2) & (work_from_home | is_telecommuting),0,0.672120453,0.327879547
+Full-time worker,(ptype == 1) & ~work_from_home,0.79647,0.09368,0.10985
+Full-time worker,(ptype == 1) & work_from_home,0,0.460276126,0.539723874
+Part-time worker,(ptype == 2) & ~work_from_home,0.61678,0.25757,0.12565
+Part-time worker,(ptype == 2) & work_from_home,0,0.672120453,0.327879547
 University student,ptype == 3,0.69229,0.15641,0.1513
 Non-working adult,ptype == 4,0,0.67169,0.32831
 Retired,ptype == 5,0,0.54295,0.45705

configs/resident/cdap_indiv_and_hhsize1.csv

@@ -63,5 +63,4 @@ 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
-Mandatory pattern unavailable if worker is telecommuting on simulation day,(is_telecommuting == True) & (is_student == False),coef_UNAVAILABLE,,
+ABM3 calibration ASC ptype=8,ptype==8,0.436,0.454,-0.731