test finals

ActivitySim · May 21, 2024 · 89f75cd · 89f75cd
1 parent a06a11c
commit 89f75cd
Show file tree

Hide file tree

Showing 14 changed files with 2,203 additions and 629 deletions.
diff --git a/configs/resident/settings.yaml b/configs/resident/settings.yaml
@@ -110,15 +110,41 @@ output_tables:
   sort: True
   tables:
     - checkpoints
-    - accessibility
-    - land_use
-    - households
-    - persons
-    - tours
-    - trips
+    - tablename: accessibility
+      decode_columns:
+        zone_id: land_use.zone_id
+    - tablename: land_use
+      decode_columns:
+        zone_id: land_use.zone_id
+        TAZ: land_use_taz.TAZ
+    - tablename: households
+      decode_columns:
+        home_zone_id: land_use.zone_id
+        TAZ: land_use_taz.TAZ
+    - tablename: persons
+      decode_columns:
+        home_zone_id: land_use.zone_id
+        school_zone_id: nonnegative | land_use.zone_id
+        workplace_zone_id: nonnegative | land_use.zone_id
+    - tablename: trips
+      decode_columns:
+        origin: land_use.zone_id
+        destination: land_use.zone_id
+        origin_parking_zone: nonnegative | land_use.zone_id
+        parking_zone: nonnegative | land_use.zone_id
+        trip_period: time_period
+        otaz: land_use_taz.TAZ
+        dtaz: land_use_taz.TAZ
+    - tablename: tours
+      decode_columns:
+        origin: land_use.zone_id
+        destination: land_use.zone_id
     - joint_tour_participants
     - vehicles
-    - proto_disaggregate_accessibility
+    - tablename: proto_disaggregate_accessibility
+      decode_columns:
+        home_zone_id: land_use.zone_id
+        TAZ: land_use_taz.TAZ
     - disaggregate_accessibility
 
 distributed_time_factor_work_mean: 1.0

diff --git a/test/regress/final_accessibility.csv b/test/regress/final_accessibility.csv
diff --git a/test/regress/final_households.csv b/test/regress/final_households.csv
diff --git a/test/regress/final_joint_tour_participants.csv b/test/regress/final_joint_tour_participants.csv
@@ -0,0 +1,39 @@
+"tour_id","household_id","person_id","participant_num","participant_id"
+105027019,784728,2100540,1,10502701901
+105027019,784728,2100541,2,10502701902
+105027020,784728,2100540,1,10502702001
+105027020,784728,2100541,2,10502702002
+106078615,796337,2121572,1,10607861501
+106078615,796337,2121573,2,10607861502
+106126071,796974,2122521,1,10612607101
+106126071,796974,2122522,2,10612607102
+106315571,799176,2126311,1,10631557101
+106315571,799176,2126312,2,10631557102
+107471515,812300,2149430,1,10747151501
+107471515,812300,2149431,2,10747151502
+107471516,812300,2149430,1,10747151601
+107471516,812300,2149431,2,10747151602
+109113569,830248,2182271,1,10911356901
+109113569,830248,2182272,2,10911356902
+109460513,833995,2189210,1,10946051301
+109460513,833995,2189211,2,10946051302
+109460519,833995,2189210,1,10946051901
+109460519,833995,2189211,2,10946051902
+109896169,838789,2197923,1,10989616901
+109896169,838789,2197924,2,10989616902
+109896170,838789,2197923,1,10989617001
+109896170,838789,2197924,2,10989617002
+111914869,860567,2238297,1,11191486901
+111914869,860567,2238298,2,11191486902
+111914870,860567,2238297,1,11191487001
+111914870,860567,2238298,2,11191487002
+112029363,861865,2240587,1,11202936301
+112029363,861865,2240588,2,11202936302
+112029369,861865,2240587,1,11202936901
+112029369,861865,2240588,2,11202936902
+112146119,863066,2242922,1,11214611901
+112146119,863066,2242923,2,11214611902
+112615213,868143,2252304,1,11261521301
+112615213,868143,2252305,2,11261521302
+113114863,873254,2262297,1,11311486301
+113114863,873254,2262298,2,11311486302
diff --git a/test/regress/final_persons.csv b/test/regress/final_persons.csv
diff --git a/test/regress/final_tours.csv b/test/regress/final_tours.csv
diff --git a/test/regress/final_trips.csv b/test/regress/final_trips.csv
diff --git a/test/regress/final_vehicles.csv b/test/regress/final_vehicles.csv
@@ -0,0 +1,104 @@
+"household_id","vehicle_num","vehicle_type","auto_operating_cost","Range","MPG","vehicle_year","vehicle_id"
+784728,1,"Car_6_Gas",17.0648934015778,0,24,2017,7847281
+786196,1,"SUV_11_Gas",19.936918666776435,0,19.5,2012,7861961
+786980,1,"Pickup_20_Gas",23.11192490428947,0,15.8,2003,7869801
+788147,1,"Car_11_Gas",17.820298057846397,0,22.4,2012,7881471
+789606,1,"Car_20_Gas",18.87049477963766,0,20.5,2003,7896061
+791851,1,"Car_9_Gas",17.429571510333602,0,23.2,2014,7918511
+791851,2,"Car_10_Gas",17.47693230884273,0,23.1,2013,7918512
+791940,1,"SUV_10_Gas",19.611513586939683,0,20,2013,7919401
+796337,1,"SUV_11_Gas",19.936918666776435,0,19.5,2012,7963371
+796974,1,"Car_6_Gas",17.0648934015778,0,24,2017,7969741
+796974,2,"Pickup_20_Gas",23.11192490428947,0,15.8,2003,7969742
+797235,1,"Car_8_Gas",17.33606430426194,0,23.4,2015,7972351
+799627,1,"Car_18_Gas",18.931187261725146,0,20.4,2005,7996271
+803225,1,"Car_19_Gas",18.810391548234733,0,20.6,2004,8032251
+805047,1,"Car_11_Hybrid",13.910747629872247,0,34.2,2012,8050471
+805047,2,"Car_8_Gas",17.33606430426194,0,23.4,2015,8050472
+807979,1,"Car_7_Gas",17.198762583204516,0,23.7,2016,8079791
+808447,1,"Car_14_Gas",18.575702722575528,0,21,2009,8084471
+812300,1,"Pickup_10_Gas",22.066319476415917,0,16.9,2013,8123001
+812688,1,"Car_5_Gas",16.79497197929317,0,29.449734763848717,2018,8126881
+812688,2,"Pickup_14_Gas",22.15571647981107,0,16.8,2009,8126882
+816340,1,"Car_11_Gas",17.820298057846397,0,22.4,2012,8163401
+816592,1,"Pickup_4_Gas",20.428738641848003,0,23.09647750296356,2019,8165921
+818181,1,"Car_11_Gas",17.820298057846397,0,22.4,2012,8181811
+818678,1,"Car_3_Gas",16.436795052240633,0,30.339852997086037,2020,8186781
+818816,1,"Car_10_Gas",17.47693230884273,0,23.1,2013,8188161
+820094,1,"Car_12_Gas",18.18581644127645,0,21.7,2011,8200941
+822459,1,"SUV_7_Gas",18.78127444907544,0,21.4,2016,8224591
+822459,2,"Pickup_14_Gas",22.15571647981107,0,16.8,2009,8224592
+823163,1,"Car_5_Gas",16.79497197929317,0,29.449734763848717,2018,8231631
+823163,2,"Van_9_Gas",22.77429762122196,0,15.7,2014,8231632
+823520,1,"Car_4_Gas",16.61588351576692,0,29.891480785306445,2019,8235201
+823520,2,"Car_20_Gas",18.87049477963766,0,20.5,2003,8235202
+824076,1,"SUV_5_Gas",18.484195416495552,0,26.005885999114497,2018,8240761
+824360,1,"Car_9_Gas",17.429571510333602,0,23.2,2014,8243601
+824360,2,"Pickup_4_Gas",20.428738641848003,0,23.09647750296356,2019,8243602
+824360,3,"SUV_5_Gas",18.484195416495552,0,26.005885999114497,2018,8243603
+824748,1,"Pickup_12_Gas",21.719066383613818,0,17.3,2011,8247481
+825301,1,"Car_12_Gas",18.18581644127645,0,21.7,2011,8253011
+830248,1,"Car_14_Gas",18.575702722575528,0,21,2009,8302481
+830248,2,"Van_9_Gas",22.77429762122196,0,15.7,2014,8302482
+830642,1,"Car_5_Diesel",14.033846104420407,0,41.48711268918141,2018,8306421
+830642,2,"Car_2_Gas",16.257706588714385,0,30.794950792042325,2021,8306422
+833913,1,"Car_20_Gas",18.87049477963766,0,20.5,2003,8339131
+833913,2,"Car_16_Gas",18.99247770038479,0,20.3,2007,8339132
+833995,1,"Car_7_Gas",17.198762583204516,0,23.7,2016,8339951
+834673,1,"Car_12_Hybrid",14.043274768042874,0,33.6,2011,8346731
+836353,1,"Car_3_Hybrid",12.741244004308445,0,47.267169887810006,2020,8363531
+836353,2,"Car_5_Diesel",14.033846104420407,0,41.48711268918141,2018,8363532
+837064,1,"Pickup_7_Gas",20.767405215983143,0,18.5,2016,8370641
+838789,1,"SUV_3_Gas",18.029059938997804,0,26.791913903437724,2020,8387891
+838789,2,"Car_10_Gas",17.47693230884273,0,23.1,2013,8387892
+841437,1,"Pickup_7_Gas",20.767405215983143,0,18.5,2016,8414371
+841609,1,"Van_1_Gas",19.755614559788665,0,22.54594266184607,2022,8416091
+845801,1,"Car_3_Gas",16.436795052240633,0,30.339852997086037,2020,8458011
+845801,2,"SUV_4_Gas",18.25662767774663,0,26.39597428910121,2019,8458012
+847093,1,"Car_6_Gas",17.0648934015778,0,24,2017,8470931
+847093,2,"Car_20_Gas",18.87049477963766,0,20.5,2003,8470932
+847266,1,"Car_3_Gas",16.436795052240633,0,30.339852997086037,2020,8472661
+849829,1,"Van_10_Gas",22.570943890916585,0,15.9,2013,8498291
+850412,1,"SUV_2_Gas",17.801492200248884,0,27.193792611989288,2021,8504121
+850412,2,"Van_11_Gas",23.08923181952813,0,15.4,2012,8504122
+851027,1,"SUV_12_Gas",20.0040125059567,0,19.4,2011,8510271
+852013,1,"SUV_7_Hybrid",15.64291344148985,0,29.1,2016,8520131
+859711,1,"Car_1_Gas",16.07861812518814,0,31.25687505392296,2022,8597111
+859711,2,"Car_2_Gas",16.257706588714385,0,30.794950792042325,2021,8597112
+860567,1,"Van_2_Gas",20.027091707348827,0,22.21275139098135,2021,8605671
+860567,2,"Car_10_Gas",17.47693230884273,0,23.1,2013,8605672
+861865,1,"Car_1_Gas",16.07861812518814,0,31.25687505392296,2022,8618651
+861865,2,"Car_8_Diesel",14.227519802649143,0,32.8,2015,8618652
+862635,1,"Car_15_Gas",18.87049477963766,0,20.5,2008,8626351
+863066,1,"SUV_2_Gas",17.801492200248884,0,27.193792611989288,2021,8630661
+863724,1,"Car_16_Gas",18.99247770038479,0,20.3,2007,8637241
+865747,1,"Pickup_12_Gas",21.719066383613818,0,17.3,2011,8657471
+866001,1,"Car_8_Gas",17.33606430426194,0,23.4,2015,8660011
+868110,1,"Car_19_Gas",18.810391548234733,0,20.6,2004,8681101
+868110,2,"Car_5_Gas",16.79497197929317,0,29.449734763848717,2018,8681102
+868143,1,"SUV_6_Gas",18.893166518476317,0,21.2,2017,8681431
+868143,2,"Car_1_Gas",16.07861812518814,0,31.25687505392296,2022,8681432
+868503,1,"Pickup_9_Gas",21.890662211930348,0,17.1,2014,8685031
+868503,2,"Car_3_Gas",16.436795052240633,0,30.339852997086037,2020,8685032
+868503,3,"SUV_20_Gas",22.028808497151836,0,16.8,2003,8685033
+868503,4,"Car_20_Gas",18.87049477963766,0,20.5,2003,8685034
+868536,1,"Van_3_Gas",20.29856885490899,0,21.884484129045667,2020,8685361
+868536,2,"Car_4_Gas",16.61588351576692,0,29.891480785306445,2019,8685362
+868536,3,"Car_6_Gas",17.0648934015778,0,24,2017,8685363
+868536,4,"Motorcycle_10_Gas",10.567523956067463,0,53,2013,8685364
+868615,1,"Car_20_Gas",18.87049477963766,0,20.5,2003,8686151
+868615,2,"Van_5_Gas",20.841523150029314,0,21.24243163294006,2018,8686152
+868944,1,"Car_1_Gas",16.07861812518814,0,31.25687505392296,2022,8689441
+871938,1,"Motorcycle_1_Gas",10.567523956067463,0,72.42030067138434,2022,8719381
+872090,1,"Car_9_Gas",17.429571510333602,0,23.2,2014,8720901
+872090,2,"Car_9_Gas",17.429571510333602,0,23.2,2014,8720902
+872123,1,"SUV_9_Gas",19.423964841426173,0,20.3,2014,8721231
+872123,2,"Pickup_7_Gas",20.767405215983143,0,18.5,2016,8721232
+872550,1,"Car_5_Gas",16.79497197929317,0,29.449734763848717,2018,8725501
+872550,2,"SUV_10_Gas",19.611513586939683,0,20,2013,8725502
+872550,3,"SUV_13_Gas",20.350131472880967,0,18.9,2010,8725503
+872713,1,"Car_1_Gas",16.07861812518814,0,31.25687505392296,2022,8727131
+872821,1,"Car_9_Gas",17.429571510333602,0,23.2,2014,8728211
+872821,2,"Car_10_Gas",17.47693230884273,0,23.1,2013,8728212
+873254,1,"SUV_6_Gas",18.893166518476317,0,21.2,2017,8732541
+873254,2,"Van_20_Gas",22.671977231070805,0,15.8,2003,8732542
diff --git a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/checkpoints.parquet b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/checkpoints.parquet
diff --git a/...ce-pipeline-hh100-recode.parquetpipeline/land_use_taz/initialize_proto_population.parquet b/...ce-pipeline-hh100-recode.parquetpipeline/land_use_taz/initialize_proto_population.parquet
diff --git a/...e/non_mandatory_tour_destination_accessibility/compute_disaggregate_accessibility.parquet b/...e/non_mandatory_tour_destination_accessibility/compute_disaggregate_accessibility.parquet
diff --git a/...ence-pipeline-hh100-recode.parquetpipeline/school_escort_trips/school_escorting.pickle.gz b/...ence-pipeline-hh100-recode.parquetpipeline/school_escort_trips/school_escorting.pickle.gz
diff --git a/...erence-pipeline-hh100-recode.parquetpipeline/school_escort_trips/stop_frequency.pickle.gz b/...erence-pipeline-hh100-recode.parquetpipeline/school_escort_trips/stop_frequency.pickle.gz
diff --git a/test/test_sandag_abm3.py b/test/test_sandag_abm3.py
@@ -22,20 +22,20 @@ def _test_path(dirname) -> Path:
     return Path(__file__).parent.joinpath(dirname)
 
 
-def regress(out_dir: Path, regress_dir: Path = None):
+def regress(out_dir: Path, regress_dir: Path = None, filename="final_trips.csv"):
     if regress_dir is None:
         regress_dir = _test_path("regress")
-    regress_trips_df = pd.read_csv(regress_dir.joinpath("final_trips.csv"))
-    final_trips_df = pd.read_csv(out_dir / "final_trips.csv")
+    regress_df = pd.read_csv(regress_dir.joinpath(filename))
+    final_df = pd.read_csv(out_dir / filename)
 
     # columns that are in the regression target must be in the output
-    missing_columns = set(regress_trips_df.columns) - set(final_trips_df.columns)
+    missing_columns = set(regress_df.columns) - set(final_df.columns)
     assert missing_columns == set()
 
     # column order may not match, so fix it before checking
-    final_trips_df = final_trips_df[regress_trips_df.columns]
+    final_df = final_df[regress_df.columns]
 
-    pdt.assert_frame_equal(final_trips_df, regress_trips_df)
+    pdt.assert_frame_equal(final_df, regress_df)
 
 
 EXPECTED_MODELS = [
@@ -165,6 +165,15 @@ def test_sandag_abm3_progressive(use_sharrow):
             if (ref_pipeline / ".gitignore").exists():
                 os.remove(ref_pipeline / ".gitignore")
 
+    # check final outputs
+    regress(out_dir, filename="final_trips.csv")
+    regress(out_dir, filename="final_households.csv")
+    regress(out_dir, filename="final_persons.csv")
+    regress(out_dir, filename="final_tours.csv")
+    regress(out_dir, filename="final_vehicles.csv")
+    regress(out_dir, filename="final_accessibility.csv")
+    regress(out_dir, filename="final_joint_tour_participants.csv")
+
 
 if __name__ == "__main__":
     # run_test_sandag_abm3(multiprocess=True)