Skip to content

Commit fbf5086

Browse files
jpn--jpn--
authored
Update test targets (#43)
* update targets * update final targets * temp * pin to activitysim repo * remove unneeded tracker func * update uv lock * Regenerate targets
1 parent 1dc3c69 commit fbf5086

189 files changed

Lines changed: 1125 additions & 1164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies = [
88
"activitysim>=1.5",
99
"multimethod<2.0",
1010
"numba>=0.57",
11-
"numpy>=1.16.1,<1.26",
11+
"numpy>=2,<3",
1212
"openmatrix>=0.3.5.0",
1313
"pandas>=2.1.0",
14-
"pandera>=0.15,<0.18.1",
14+
"pandera>=0.30",
1515
"psutil>=4.1",
1616
"pydantic>=2.6",
1717
"setuptools>=80.9.0,<81",
@@ -27,4 +27,4 @@ dev = [
2727

2828
[tool.uv.sources]
2929
activitysim = { git = "https://github.com/ActivitySim/ActivitySim", branch = "main" }
30-
# TODO: unpin from source once we have a release with the new features we need
30+
## TODO: unpin from source once we have a release with the new features we need

‎scripts/fulldata.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,9 @@ def get_full_data(full_data_dir):
9696
# write a gitignore to the full data dir to avoid accidental commits
9797
if not full_data_dir.joinpath(".gitignore").exists():
9898
full_data_dir.joinpath(".gitignore").write_text("**\n")
99+
100+
101+
if __name__ == "__main__":
102+
import pathlib
103+
104+
get_full_data(pathlib.Path("/tmp/sandag-abm3-example"))

‎test/regress/final_households.csv‎

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

‎test/regress/final_persons.csv‎

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

‎test/regress/final_tours.csv‎

Lines changed: 175 additions & 181 deletions
Large diffs are not rendered by default.

‎test/regress/final_trips.csv‎

Lines changed: 620 additions & 640 deletions
Large diffs are not rendered by default.

‎test/regress/final_vehicles.csv‎

Lines changed: 101 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,102 @@
11
"household_id","vehicle_num","vehicle_type","auto_operating_cost","Range","MPG","vehicle_year","vehicle_id"
2-
784728,1,"Car_3_Gas",29.044636256912945,0,30.339852997086037,2020,7847281
3-
786196,1,"SUV_11_Gas",35.22952917036238,0,19.5,2012,7861961
4-
786980,1,"Pickup_20_Gas",40.83992347100951,0,15.8,2003,7869801
5-
788147,1,"Car_12_Gas",32.13524424275512,0,21.7,2011,7881471
6-
789606,1,"Car_20_Gas",33.34510499891135,0,20.5,2003,7896061
7-
791851,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,7918511
8-
791851,2,"Car_9_Diesel",25.70505837954799,0,31.5,2014,7918512
9-
791940,1,"SUV_10_Gas",34.654522172345345,0,20,2013,7919401
10-
796337,1,"SUV_11_Gas",35.22952917036238,0,19.5,2012,7963371
11-
796974,1,"Car_5_Hybrid",22.998974553004228,0,45.88043377690312,2018,7969741
12-
796974,2,"Pickup_20_Gas",40.83992347100951,0,15.8,2003,7969742
13-
797235,1,"Car_8_Gas",30.63368985519484,0,23.4,2015,7972351
14-
799627,1,"Car_20_Gas",33.34510499891135,0,20.5,2003,7996271
15-
803225,1,"Car_19_Gas",33.238899592783525,0,20.6,2004,8032251
16-
805047,1,"Car_13_Gas",32.32750893708441,0,21.5,2010,8050471
17-
805047,2,"Car_10_Gas",30.882610641776562,0,23.1,2013,8050472
18-
807979,1,"Car_7_Gas",30.391070869383654,0,23.7,2016,8079791
19-
808447,1,"Car_14_Gas",32.824192738243504,0,21,2009,8084471
20-
812300,1,"Pickup_10_Gas",38.99228655491246,0,16.9,2013,8123001
21-
812688,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8126881
22-
812688,2,"Pickup_19_Gas",39.9691743472184,0,16.3,2004,8126882
23-
816340,1,"Car_11_Gas",31.48935503757862,0,22.4,2012,8163401
24-
816592,1,"Pickup_7_Gas",36.697040303846975,0,18.5,2016,8165921
25-
818181,1,"Car_11_Gas",31.48935503757862,0,22.4,2012,8181811
26-
818678,1,"Car_3_Gas",29.044636256912945,0,30.339852997086037,2020,8186781
27-
818816,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8188161
28-
820094,1,"Car_12_Gas",32.13524424275512,0,21.7,2011,8200941
29-
822459,1,"SUV_7_Gas",33.18744822703672,0,21.4,2016,8224591
30-
822459,2,"Pickup_14_Gas",39.1502555164903,0,16.8,2009,8224592
31-
823163,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8231631
32-
823163,2,"Van_12_Gas",41.37844084189838,0,15.1,2011,8231632
33-
823520,1,"Car_4_Gas",29.361094499800235,0,29.891480785306445,2019,8235201
34-
823520,2,"Car_20_Gas",33.34510499891135,0,20.5,2003,8235202
35-
824076,1,"SUV_5_Gas",32.66249476661974,0,26.005885999114497,2018,8240761
36-
824360,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8243601
37-
824360,2,"Pickup_4_Gas",36.098599584298725,0,23.09647750296356,2019,8243602
38-
824360,3,"SUV_5_Gas",32.66249476661974,0,26.005885999114497,2018,8243603
39-
824748,1,"Pickup_14_Gas",39.1502555164903,0,16.8,2009,8247481
40-
825301,1,"Car_12_Gas",32.13524424275512,0,21.7,2011,8253011
41-
830248,1,"Car_15_Gas",33.34510499891135,0,20.5,2008,8302481
42-
830248,2,"Van_9_Gas",40.243319230588035,0,15.7,2014,8302482
43-
830642,1,"Car_5_Gas",29.67755274268745,0,29.449734763848717,2018,8306421
44-
830642,2,"Car_2_Gas",28.728178014025737,0,30.794950792042325,2021,8306422
45-
833913,1,"Car_20_Gas",33.34510499891135,0,20.5,2003,8339131
46-
833913,2,"Car_16_Gas",33.56065490090841,0,20.3,2007,8339132
47-
833995,1,"Car_7_Gas",30.391070869383654,0,23.7,2016,8339951
48-
834673,1,"Car_12_Gas",32.13524424275512,0,21.7,2011,8346731
49-
836353,1,"Car_3_Hybrid",22.514413326292903,0,47.267169887810006,2020,8363531
50-
836353,2,"Car_5_Gas",29.67755274268745,0,29.449734763848717,2018,8363532
51-
837064,1,"Pickup_7_Gas",36.697040303846975,0,18.5,2016,8370641
52-
838789,1,"SUV_3_Gas",31.858247688675156,0,26.791913903437724,2020,8387891
53-
838789,2,"Car_10_Gas",30.882610641776562,0,23.1,2013,8387892
54-
841437,1,"Pickup_12_Gas",38.37867302882849,0,17.3,2011,8414371
55-
841609,1,"Van_1_Gas",34.90915577502541,0,22.54594266184607,2022,8416091
56-
845801,1,"Car_3_Gas",29.044636256912945,0,30.339852997086037,2020,8458011
57-
845801,2,"SUV_4_Gas",32.26037122764736,0,26.39597428910121,2019,8458012
58-
847093,1,"Car_6_Gas",30.15451735186392,0,24,2017,8470931
59-
847093,2,"Car_20_Gas",33.34510499891135,0,20.5,2003,8470932
60-
847266,1,"Car_3_Gas",29.044636256912945,0,30.339852997086037,2020,8472661
61-
849829,1,"Van_9_Gas",40.243319230588035,0,15.7,2014,8498291
62-
850412,1,"SUV_2_Gas",31.45612414970278,0,27.193792611989288,2021,8504121
63-
850412,2,"Van_10_Gas",39.883983051641096,0,15.9,2013,8504122
64-
851027,1,"SUV_12_Gas",35.34808732892535,0,19.4,2011,8510271
65-
852013,1,"SUV_7_Diesel",30.16946753399176,0,25,2016,8520131
66-
859711,1,"Car_1_Gas",28.41171977113853,0,31.25687505392296,2022,8597111
67-
859711,2,"Car_2_Gas",28.728178014025737,0,30.794950792042325,2021,8597112
68-
860567,1,"Van_2_Gas",35.388869428319055,0,22.21275139098135,2021,8605671
69-
860567,2,"Car_10_Gas",30.882610641776562,0,23.1,2013,8605672
70-
861865,1,"Car_1_Gas",28.41171977113853,0,31.25687505392296,2022,8618651
71-
861865,2,"Car_8_Gas",30.63368985519484,0,23.4,2015,8618652
72-
862635,1,"Car_15_Gas",33.34510499891135,0,20.5,2008,8626351
73-
863066,1,"SUV_2_Gas",31.45612414970278,0,27.193792611989288,2021,8630661
74-
863724,1,"Car_15_Gas",33.34510499891135,0,20.5,2008,8637241
75-
865747,1,"Pickup_14_Gas",39.1502555164903,0,16.8,2009,8657471
76-
866001,1,"Car_8_Gas",30.63368985519484,0,23.4,2015,8660011
77-
868110,1,"Car_19_Gas",33.238899592783525,0,20.6,2004,8681101
78-
868110,2,"Car_4_BEV",15.403056255769519,147.82398967596902,116.75645063025708,2019,8681102
79-
868143,1,"SUV_6_Gas",33.385167091660435,0,21.2,2017,8681431
80-
868143,2,"Car_1_Gas",28.41171977113853,0,31.25687505392296,2022,8681432
81-
868503,1,"Pickup_9_Gas",38.6818914117807,0,17.1,2014,8685031
82-
868503,2,"Car_3_Gas",29.044636256912945,0,30.339852997086037,2020,8685032
83-
868503,3,"SUV_20_Gas",38.92600278457262,0,16.8,2003,8685033
84-
868503,4,"Car_20_Gas",33.34510499891135,0,20.5,2003,8685034
85-
868536,1,"Van_11_Gas",40.79982365895093,0,15.4,2012,8685361
86-
868536,2,"Car_7_Gas",30.391070869383654,0,23.7,2016,8685362
87-
868536,3,"Car_10_Gas",30.882610641776562,0,23.1,2013,8685363
88-
868536,4,"Motorcycle_16_Gas",18.673341637751523,0,53,2007,8685364
89-
868615,1,"Car_20_Gas",33.34510499891135,0,20.5,2003,8686151
90-
868615,2,"Van_3_Gas",35.86858308161269,0,21.884484129045667,2020,8686152
91-
868944,1,"Car_1_Gas",28.41171977113853,0,31.25687505392296,2022,8689441
92-
871938,1,"Motorcycle_2_Gas",18.673341637751523,0,71.35004992254615,2021,8719381
93-
872090,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8720901
94-
872090,2,"Car_9_Gas",30.798921749802023,0,23.2,2014,8720902
95-
872123,1,"SUV_9_Gas",34.32311418942852,0,20.3,2014,8721231
96-
872123,2,"Pickup_7_Gas",36.697040303846975,0,18.5,2016,8721232
97-
872550,1,"Car_5_Gas",29.67755274268745,0,29.449734763848717,2018,8725501
98-
872550,2,"SUV_10_Gas",34.654522172345345,0,20,2013,8725502
99-
872550,3,"SUV_13_Gas",35.95969679804527,0,18.9,2010,8725503
100-
872713,1,"Car_1_Gas",28.41171977113853,0,31.25687505392296,2022,8727131
101-
872821,1,"Car_9_Gas",30.798921749802023,0,23.2,2014,8728211
102-
872821,2,"Car_10_Gas",30.882610641776562,0,23.1,2013,8728212
103-
873254,1,"SUV_5_Gas",32.66249476661974,0,26.005885999114497,2018,8732541
104-
873254,2,"Van_20_Gas",40.06251400036156,0,15.8,2003,8732542
2+
784728,1,"Car_3_Gas",29.111220259180275,0,30.339852997086037,2020,7847281
3+
786196,1,"SUV_11_Gas",35.310291863666826,0,19.5,2012,7861961
4+
786980,1,"Pickup_20_Gas",40.93354783362634,0,15.8,2003,7869801
5+
788147,1,"Car_12_Gas",32.20891337589882,0,21.7,2011,7881471
6+
789606,1,"Car_20_Gas",33.42154770341668,0,20.5,2003,7896061
7+
791851,1,"Car_9_Gas",30.86952740165046,0,23.2,2014,7918511
8+
791851,2,"Car_9_Diesel",25.763986494546096,0,31.5,2014,7918512
9+
791940,1,"SUV_10_Gas",34.73396667846641,0,20,2013,7919401
10+
796337,1,"SUV_11_Gas",35.310291863666826,0,19.5,2012,7963371
11+
796974,1,"Car_5_Hybrid",23.051699047821025,0,45.88043377690312,2018,7969741
12+
796974,2,"Pickup_20_Gas",40.93354783362634,0,15.8,2003,7969742
13+
797235,1,"Car_8_Gas",30.70391671762592,0,23.4,2015,7972351
14+
799627,1,"Car_20_Gas",33.42154770341668,0,20.5,2003,7996271
15+
803225,1,"Car_19_Gas",33.31509882441696,0,20.6,2004,8032251
16+
805047,1,"Car_13_Gas",32.401618831569714,0,21.5,2010,8050471
17+
805047,2,"Car_10_Gas",30.953408148028807,0,23.1,2013,8050472
18+
807979,1,"Car_7_Gas",30.460741534692534,0,23.7,2016,8079791
19+
808447,1,"Car_14_Gas",32.89944126621177,0,21,2009,8084471
20+
812300,1,"Pickup_10_Gas",39.08167526246643,0,16.9,2013,8123001
21+
812688,1,"Car_9_Gas",30.86952740165046,0,23.2,2014,8126881
22+
812688,2,"Pickup_19_Gas",40.0608025422427,0,16.3,2004,8126882
23+
816340,1,"Car_11_Gas",31.561543488095698,0,22.4,2012,8163401
24+
816592,1,"Pickup_7_Gas",36.78116722467264,0,18.5,2016,8165921
25+
818181,1,"Car_11_Gas",31.561543488095698,0,22.4,2012,8181811
26+
818678,1,"Car_3_Gas",29.111220259180275,0,30.339852997086037,2020,8186781
27+
818816,1,"Car_9_Gas",30.86952740165046,0,23.2,2014,8188161
28+
820094,1,"Car_12_Gas",32.20891337589882,0,21.7,2011,8200941
29+
822459,1,"SUV_7_Gas",33.26352950787802,0,21.4,2016,8224591
30+
822459,2,"Pickup_14_Gas",39.24000636339429,0,16.8,2009,8224592
31+
823163,1,"Car_8_Gas",30.70391671762592,0,23.4,2015,8231631
32+
823520,1,"Car_4_Gas",29.428403973585798,0,29.891480785306445,2019,8235201
33+
823520,2,"Car_20_Gas",33.42154770341668,0,20.5,2003,8235202
34+
824076,1,"SUV_5_Gas",32.73737260658854,0,26.005885999114497,2018,8240761
35+
824360,1,"Car_9_Gas",30.86952740165046,0,23.2,2014,8243601
36+
824360,2,"Pickup_4_Gas",36.18135459680112,0,23.09647750296356,2019,8243602
37+
824360,3,"SUV_5_Gas",32.73737260658854,0,26.005885999114497,2018,8243603
38+
824748,1,"Pickup_14_Gas",39.24000636339429,0,16.8,2009,8247481
39+
825301,1,"Car_12_Gas",32.20891337589882,0,21.7,2011,8253011
40+
830248,1,"Car_15_Gas",33.42154770341668,0,20.5,2008,8302481
41+
830248,2,"Van_9_Gas",40.33557589495774,0,15.7,2014,8302482
42+
830642,1,"Car_5_Gas",29.745587687991247,0,29.449734763848717,2018,8306421
43+
830642,2,"Car_2_Gas",28.79403654477483,0,30.794950792042325,2021,8306422
44+
833913,1,"Car_20_Gas",33.42154770341668,0,20.5,2003,8339131
45+
833913,2,"Car_16_Gas",33.63759174743143,0,20.3,2007,8339132
46+
833995,1,"Car_7_Gas",30.460741534692534,0,23.7,2016,8339951
47+
834673,1,"Car_12_Gas",32.20891337589882,0,21.7,2011,8346731
48+
836353,1,"Car_3_Hybrid",22.566026978283762,0,47.267169887810006,2020,8363531
49+
836353,2,"Car_5_Gas",29.745587687991247,0,29.449734763848717,2018,8363532
50+
837064,1,"Pickup_7_Gas",36.78116722467264,0,18.5,2016,8370641
51+
838789,1,"SUV_3_Gas",31.931281815099478,0,26.791913903437724,2020,8387891
52+
838789,2,"Car_10_Gas",30.953408148028807,0,23.1,2013,8387892
53+
841437,1,"Pickup_12_Gas",38.46665504483188,0,17.3,2011,8414371
54+
841609,1,"Van_1_Gas",34.989184021436024,0,22.54594266184607,2022,8416091
55+
845801,1,"Car_3_Gas",29.111220259180275,0,30.339852997086037,2020,8458011
56+
845801,2,"SUV_4_Gas",32.334327210843924,0,26.39597428910121,2019,8458012
57+
847093,1,"Car_6_Gas",30.22364572496409,0,24,2017,8470931
58+
847093,2,"Car_20_Gas",33.42154770341668,0,20.5,2003,8470932
59+
847266,1,"Car_3_Gas",29.111220259180275,0,30.339852997086037,2020,8472661
60+
849829,1,"Van_9_Gas",40.33557589495774,0,15.7,2014,8498291
61+
850412,1,"SUV_2_Gas",31.52823641935486,0,27.193792611989288,2021,8504121
62+
850412,2,"Van_10_Gas",39.97541594804407,0,15.9,2013,8504122
63+
851027,1,"SUV_12_Gas",35.429121813435195,0,19.4,2011,8510271
64+
852013,1,"SUV_7_Diesel",30.23863017995911,0,25,2016,8520131
65+
859711,1,"Car_1_Gas",28.476852830369385,0,31.25687505392296,2022,8597111
66+
859711,2,"Car_2_Gas",28.79403654477483,0,30.794950792042325,2021,8597112
67+
860567,1,"Van_2_Gas",35.469997404631464,0,22.21275139098135,2021,8605671
68+
860567,2,"Car_10_Gas",30.953408148028807,0,23.1,2013,8605672
69+
861865,1,"Car_1_Gas",28.476852830369385,0,31.25687505392296,2022,8618651
70+
861865,2,"Car_8_Gas",30.70391671762592,0,23.4,2015,8618652
71+
862635,1,"Car_15_Gas",33.42154770341668,0,20.5,2008,8626351
72+
863066,1,"SUV_2_Gas",31.52823641935486,0,27.193792611989288,2021,8630661
73+
863724,1,"Car_15_Gas",33.42154770341668,0,20.5,2008,8637241
74+
865747,1,"Pickup_14_Gas",39.24000636339429,0,16.8,2009,8657471
75+
866001,1,"Car_8_Gas",30.70391671762592,0,23.4,2015,8660011
76+
868110,1,"Car_19_Gas",33.31509882441696,0,20.6,2004,8681101
77+
868110,2,"Car_4_BEV",15.438367324002085,147.82398967596902,116.75645063025708,2019,8681102
78+
868143,1,"SUV_6_Gas",33.46170163737357,0,21.2,2017,8681431
79+
868143,2,"Car_1_Gas",28.476852830369385,0,31.25687505392296,2022,8681432
80+
868503,1,"Pickup_9_Gas",38.770568547300115,0,17.1,2014,8685031
81+
868503,2,"Car_3_Gas",29.111220259180275,0,30.339852997086037,2020,8685032
82+
868503,3,"SUV_20_Gas",39.015239538468926,0,16.8,2003,8685033
83+
868503,4,"Car_20_Gas",33.42154770341668,0,20.5,2003,8685034
84+
868536,1,"Van_11_Gas",40.893356093889494,0,15.4,2012,8685361
85+
868536,2,"Car_7_Gas",30.460741534692534,0,23.7,2016,8685362
86+
868536,3,"Car_10_Gas",30.953408148028807,0,23.1,2013,8685363
87+
868536,4,"Motorcycle_16_Gas",18.716149742179088,0,53,2007,8685364
88+
868615,1,"Car_20_Gas",33.42154770341668,0,20.5,2003,8686151
89+
868615,2,"Van_3_Gas",35.950810787826896,0,21.884484129045667,2020,8686152
90+
868944,1,"Car_1_Gas",28.476852830369385,0,31.25687505392296,2022,8689441
91+
871938,1,"Motorcycle_2_Gas",18.716149742179088,0,71.35004992254615,2021,8719381
92+
872090,1,"Car_8_Gas",30.70391671762592,0,23.4,2015,8720901
93+
872123,1,"SUV_9_Gas",34.40179895217767,0,20.3,2014,8721231
94+
872123,2,"Pickup_7_Gas",36.78116722467264,0,18.5,2016,8721232
95+
872550,1,"Car_5_Gas",29.745587687991247,0,29.449734763848717,2018,8725501
96+
872550,2,"SUV_10_Gas",34.73396667846641,0,20,2013,8725502
97+
872550,3,"SUV_13_Gas",36.042133379862115,0,18.9,2010,8725503
98+
872713,1,"Car_1_Gas",28.476852830369385,0,31.25687505392296,2022,8727131
99+
872821,1,"Car_9_Gas",30.86952740165046,0,23.2,2014,8728211
100+
872821,2,"Car_10_Gas",30.953408148028807,0,23.1,2013,8728212
101+
873254,1,"SUV_5_Gas",32.73737260658854,0,26.005885999114497,2018,8732541
102+
873254,2,"Van_20_Gas",40.15435617388508,0,15.8,2003,8732542

‎test/regress/reference-pipeline-hh100-recode.parquetpipeline/accessibility/compute_accessibility.parquet‎

0 Bytes
Binary file not shown.

‎test/regress/reference-pipeline-hh100-recode.parquetpipeline/accessibility/initialize_proto_population.parquet‎

0 Bytes
Binary file not shown.

‎test/regress/reference-pipeline-hh100-recode.parquetpipeline/checkpoints.parquet‎

618 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)