diff --git a/puf_stage2/puf_weights.csv.gz b/puf_stage2/puf_weights.csv.gz index c4356369..b23e6ac1 100644 Binary files a/puf_stage2/puf_weights.csv.gz and b/puf_stage2/puf_weights.csv.gz differ diff --git a/puf_stage3/puf_ratios.csv b/puf_stage3/puf_ratios.csv index 2fef647f..7337e4cc 100644 --- a/puf_stage3/puf_ratios.csv +++ b/puf_stage3/puf_ratios.csv @@ -1,26 +1,26 @@ agi_bin,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18 INT2011,1.0259,0.5597,0.9448,0.9681,0.9728,0.9464,0.8390,0.8997,0.9713,0.9239,0.9342,0.9413,0.9497,0.9510,0.9693,0.9702,0.9569,1.0123,1.7014 -INT2012,0.7778,0.9454,0.8433,0.8157,0.7153,0.8101,0.7961,0.7940,0.8481,0.9063,0.9129,0.9181,1.0344,1.0435,1.0129,1.1436,1.0975,1.2339,1.3445 -INT2013,1.1325,0.7670,0.7821,0.7778,0.8935,0.8699,0.9558,0.9051,0.8342,0.8596,0.9746,1.0272,1.0497,1.0505,1.0891,0.9632,1.0448,0.9690,1.1435 -INT2014,0.9106,0.8669,0.8492,0.7737,0.8431,0.8802,0.9729,0.8834,0.8367,1.0108,0.8443,1.0534,1.0274,0.9291,1.0609,1.1524,1.0626,1.0728,1.0867 -INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9699,0.9891,1.0163,0.9966,0.9906,1.0241,0.9827,1.0221,1.1437,1.1672 -INT2016,0.9843,1.0086,1.0453,1.0314,1.0447,1.0342,1.0129,1.0016,1.0025,1.0175,0.9484,0.9531,0.9752,1.0131,1.0723,1.0130,1.0803,1.0810,0.9937 -INT2017,0.9932,0.9174,0.8978,0.8924,0.8944,0.9131,0.9198,0.9410,0.9611,0.9787,1.0156,1.0693,1.0312,0.9881,0.9350,0.9756,0.9565,1.0484,1.1943 -INT2018,0.9991,0.9744,0.9683,0.9667,0.9757,0.9725,0.9747,0.9779,0.9742,0.9969,0.9930,1.0038,1.0148,1.0067,1.0231,0.9898,1.0182,1.0911,0.9981 -INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9852,0.9826,0.9938,0.9934,1.0109,1.0020,1.0074,0.9983,1.0006,1.0253,1.0282,1.0196 -INT2020,1.0017,0.9799,0.9740,0.9756,0.9843,0.9849,0.9831,0.9833,0.9931,0.9964,0.9958,1.0114,1.0058,1.0047,1.0078,0.9991,1.0129,1.0113,1.0113 -INT2021,0.9959,0.9797,0.9776,0.9780,0.9834,0.9898,0.9883,0.9869,0.9920,0.9978,1.0043,0.9974,1.0066,1.0119,1.0049,1.0040,1.0303,1.0085,1.0022 -INT2022,1.0062,0.9815,0.9810,0.9783,0.9727,0.9820,0.9851,0.9893,0.9934,1.0049,1.0022,1.0050,1.0029,1.0041,1.0047,1.0044,1.0133,0.9990,1.0111 -INT2023,0.9983,0.9812,0.9761,0.9789,0.9892,0.9893,0.9851,1.0197,0.9942,0.9956,1.0022,1.0012,1.0023,1.0074,1.0006,1.0093,1.0214,1.0020,0.9943 -INT2024,1.0016,0.9843,0.9813,0.9791,0.9709,0.9789,0.9893,1.0102,0.9906,0.9984,0.9987,0.9971,1.0048,1.0076,1.0089,1.0075,1.0238,1.0148,1.0081 -INT2025,1.0086,0.9934,0.9772,0.9767,0.9834,0.9817,1.0012,0.9941,0.9934,1.0008,0.9990,0.9978,1.0051,1.0074,1.0142,1.0150,1.0238,0.9941,0.9912 -INT2026,1.0088,0.9843,0.9792,0.9796,0.9872,0.9904,0.9995,0.9909,0.9953,0.9939,0.9931,0.9932,1.0068,1.0143,1.0373,1.0250,1.0207,0.9992,0.9937 -INT2027,1.0115,0.9888,0.9839,0.9805,0.9888,0.9905,0.9818,0.9951,0.9905,0.9944,0.9993,0.9913,1.0074,1.0184,1.0174,1.0275,1.0260,0.9935,0.9946 -INT2028,1.0062,0.9977,0.9772,0.9829,0.9863,0.9878,1.0107,0.9957,0.9924,0.9955,0.9931,0.9921,1.0068,1.0177,1.0271,1.0221,1.0222,0.9960,0.9918 -INT2029,1.0101,0.9939,0.9780,0.9801,0.9824,0.9852,1.0025,0.9850,0.9945,0.9933,0.9935,0.9928,1.0033,1.0285,1.0278,1.0474,1.0236,1.0012,0.9924 -INT2030,1.0294,1.0010,0.9821,0.9840,0.9821,0.9917,0.9822,0.9867,0.9830,0.9890,0.9815,0.9921,1.0057,1.0359,1.0382,1.0449,1.0299,0.9948,0.9921 -INT2031,1.0280,1.0214,0.9858,0.9918,0.9829,0.9887,0.9858,0.9780,0.9910,0.9938,0.9791,0.9870,0.9952,1.0446,1.0439,1.0732,1.0287,1.0061,0.9932 -INT2032,1.0079,1.1010,0.9920,0.9811,0.9867,0.9849,0.9881,0.9740,0.9732,0.9791,0.9659,0.9835,0.9898,1.0786,1.0904,1.1373,1.0482,1.0099,0.9984 -INT2033,0.9352,0.8345,0.9707,0.9751,0.9896,0.9848,0.9879,1.0383,1.0312,1.0351,1.1159,1.0745,1.0375,0.8504,0.8247,0.7425,0.8974,1.0566,1.0930 -INT2034,1.0278,0.9998,0.9801,0.9801,0.9905,0.9881,0.9984,0.9804,0.9885,0.9931,0.9775,0.9842,1.0026,1.0381,1.0368,1.0580,1.0409,1.0028,0.9939 -INT2035,1.0241,1.0200,0.9891,0.9840,0.9837,0.9859,0.9885,0.9688,0.9850,0.9882,0.9774,0.9926,1.0011,1.0428,1.0542,1.0592,1.0396,0.9982,0.9941 +INT2012,0.7778,0.9454,0.8433,0.8152,0.7153,0.8101,0.7961,0.7940,0.8481,0.9063,0.9129,0.9183,1.0343,1.0435,1.0129,1.1436,1.0975,1.2339,1.3445 +INT2013,1.1325,0.7670,0.7821,0.7778,0.8935,0.8699,0.9558,0.9045,0.8342,0.8595,0.9746,1.0269,1.0499,1.0505,1.0891,0.9632,1.0449,0.9690,1.1443 +INT2014,0.9106,0.8669,0.8492,0.7738,0.8431,0.8802,0.9729,0.8840,0.8368,1.0109,0.8448,1.0532,1.0274,0.9291,1.0609,1.1524,1.0624,1.0728,1.0860 +INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9698,0.9887,1.0165,0.9966,0.9906,1.0241,0.9827,1.0221,1.1437,1.1671 +INT2016,0.9843,1.0086,1.0453,1.0319,1.0447,1.0342,1.0110,1.0028,1.0025,1.0174,0.9482,0.9531,0.9752,1.0131,1.0723,1.0130,1.0804,1.0810,0.9938 +INT2017,0.9932,0.9174,0.8978,0.8918,0.8944,0.9131,0.9215,0.9399,0.9611,0.9788,1.0156,1.0693,1.0312,0.9881,0.9354,0.9756,0.9565,1.0484,1.1942 +INT2018,0.9991,0.9744,0.9683,0.9673,0.9757,0.9725,0.9748,0.9779,0.9742,0.9969,0.9929,1.0038,1.0148,1.0067,1.0226,0.9898,1.0182,1.0909,0.9981 +INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9852,0.9826,0.9937,0.9934,1.0109,1.0020,1.0074,0.9985,1.0006,1.0253,1.0283,1.0196 +INT2020,1.0017,0.9799,0.9739,0.9756,0.9843,0.9849,0.9831,0.9833,0.9932,0.9965,0.9958,1.0114,1.0058,1.0047,1.0076,0.9991,1.0129,1.0113,1.0113 +INT2021,0.9959,0.9797,0.9776,0.9781,0.9836,0.9898,0.9883,0.9869,0.9920,0.9978,1.0043,0.9974,1.0066,1.0119,1.0049,1.0040,1.0303,1.0085,1.0022 +INT2022,1.0062,0.9815,0.9810,0.9783,0.9724,0.9820,0.9850,0.9893,0.9934,1.0049,1.0022,1.0050,1.0029,1.0042,1.0047,1.0044,1.0133,0.9990,1.0111 +INT2023,0.9983,0.9812,0.9761,0.9789,0.9891,0.9893,0.9852,1.0199,0.9942,0.9956,1.0022,1.0012,1.0023,1.0073,1.0006,1.0093,1.0214,1.0020,0.9943 +INT2024,1.0016,0.9843,0.9813,0.9791,0.9712,0.9789,0.9893,1.0100,0.9905,0.9984,0.9987,0.9971,1.0048,1.0077,1.0089,1.0075,1.0238,1.0148,1.0081 +INT2025,1.0086,0.9934,0.9772,0.9767,0.9834,0.9817,1.0012,0.9941,0.9935,1.0008,0.9990,0.9978,1.0051,1.0074,1.0142,1.0150,1.0238,0.9941,0.9912 +INT2026,1.0089,0.9843,0.9792,0.9796,0.9872,0.9904,0.9989,0.9909,0.9953,0.9939,0.9931,0.9932,1.0070,1.0142,1.0373,1.0250,1.0208,0.9992,0.9937 +INT2027,1.0115,0.9888,0.9839,0.9805,0.9888,0.9905,0.9824,0.9951,0.9905,0.9944,0.9993,0.9913,1.0073,1.0184,1.0175,1.0275,1.0259,0.9935,0.9946 +INT2028,1.0062,0.9977,0.9772,0.9829,0.9863,0.9878,1.0107,0.9957,0.9924,0.9954,0.9931,0.9921,1.0068,1.0177,1.0271,1.0221,1.0222,0.9960,0.9918 +INT2029,1.0101,0.9939,0.9780,0.9801,0.9824,0.9852,1.0025,0.9850,0.9945,0.9933,0.9934,0.9928,1.0033,1.0285,1.0278,1.0474,1.0236,1.0013,0.9924 +INT2030,1.0295,1.0010,0.9821,0.9840,0.9821,0.9917,0.9822,0.9859,0.9830,0.9890,0.9815,0.9922,1.0058,1.0359,1.0382,1.0449,1.0299,0.9947,0.9921 +INT2031,1.0280,1.0214,0.9858,0.9918,0.9829,0.9886,0.9858,0.9788,0.9910,0.9938,0.9791,0.9869,0.9950,1.0446,1.0442,1.0732,1.0287,1.0061,0.9932 +INT2032,1.0079,1.1009,0.9920,0.9811,0.9867,0.9849,0.9881,0.9740,0.9732,0.9791,0.9662,0.9835,0.9898,1.0786,1.0900,1.1373,1.0482,1.0099,0.9983 +INT2033,0.9352,0.8346,0.9707,0.9745,0.9896,0.9850,0.9878,1.0383,1.0313,1.0351,1.1156,1.0746,1.0377,0.8505,0.8247,0.7425,0.8974,1.0567,1.0930 +INT2034,1.0278,0.9998,0.9801,0.9808,0.9905,0.9879,0.9984,0.9804,0.9885,0.9931,0.9775,0.9841,1.0025,1.0381,1.0368,1.0580,1.0409,1.0028,0.9939 +INT2035,1.0241,1.0200,0.9891,0.9840,0.9837,0.9859,0.9886,0.9688,0.9850,0.9882,0.9774,0.9926,1.0011,1.0428,1.0542,1.0592,1.0396,0.9982,0.9940 diff --git a/tests/puf_agg_expected.txt b/tests/puf_agg_expected.txt index ae505c4c..32c52fc6 100644 --- a/tests/puf_agg_expected.txt +++ b/tests/puf_agg_expected.txt @@ -1,95 +1,95 @@ VARIABLE SUM MIN MAX DSI 8272 0 1 -EIC 42866 0 3 +EIC 42865 0 3 FLPDYR 508508274 2008 2011 MARS 454004 1 4 MIDR 1657 0 1 RECID 31971239146 1 252868 XTOT 533466 0 10 -a_lineno 360919 1 16 -age_head 11655139 1 85 -age_spouse 5889518 0 96 -agi_bin 1865530 0 18 +a_lineno 360923 1 16 +age_head 11655122 1 85 +age_spouse 5888617 0 96 +agi_bin 1865533 0 18 blind_head 3115 0 1 blind_spouse 602 0 1 -cmbtp 4308354591 -23842830 83355100 +cmbtp 4308353291 -23842830 83355100 data_source 234486 0 1 -e00200 39329010779 0 56530000 -e00200p 23688273564 0 28265000 -e00200s 15640737215 0 28265000 -e00300 3541845142 0 29460000 -e00400 2464032363 0 14350000 -e00600 5842625204 0 37050000 -e00650 4438625087 0 37050000 +e00200 39328990219 0 56530000 +e00200p 23688269867 0 28265000 +e00200s 15640720352 0 28265000 +e00300 3541835522 0 29460000 +e00400 2464036163 0 14350000 +e00600 5842624644 0 37050000 +e00650 4438625977 0 37050000 e00700 463647980 0 2874000 e00800 9197298 0 174000 -e00900 2856893337 -29990000 18990000 -e00900p 2418258048 -29990000 18990000 -e00900s 438635289 -5433000 7335000 +e00900 2856875387 -29990000 18990000 +e00900p 2418242061 -29990000 18990000 +e00900s 438633326 -5433000 7335000 e01100 5160646 0 282700 e01200 -532271778 -20290000 13350000 -e01400 1677384382 0 6424000 -e01500 7575347589 0 47380000 -e01700 1339159805 0 3528000 -e02000 19712194864 -40760000 65100000 +e01400 1677376162 0 6424000 +e01500 7575358729 0 47380000 +e01700 1339170945 0 3528000 +e02000 19712594264 -40760000 65100000 e02100 -92569840 -9031000 3169000 e02100p -91084562 -9031000 3169000 e02100s -1485278 -2997000 1328000 -e02300 128973716 0 100000 -e02400 1018803578 0 114976 +e02300 128989256 0 100000 +e02400 1018795978 0 114976 e03150 32163222 0 12000 -e03210 13275188 0 2500 +e03210 13273648 0 2500 e03220 1421528 0 500 e03230 6100028 0 4000 e03240 469499524 0 4776000 -e03270 222516172 0 64500 +e03270 222520832 0 64500 e03290 21948270 0 9000 -e03300 372776630 0 472900 +e03300 372823830 0 472900 e03400 1933476 0 540400 e03500 7824760 0 104700 -e07240 1467842 0 2000 +e07240 1467822 0 2000 e07260 9716096 0 280500 e07300 713366224 0 7737000 e07400 126526472 0 3297000 e07600 18659918 0 515700 e09700 301934 0 83700 e09800 22548 0 790 -e09900 15246052 0 339900 +e09900 15246992 0 339900 e11200 16304512 0 28800 -e17500 233117120 0 772900 -e18400 5886365530 0 15160000 -e18500 1172989784 0 578400 -e19200 1881497312 0 5127000 -e19800 2421699498 0 30100000 +e17500 233083320 0 772900 +e18400 5886386430 0 15160000 +e18500 1172996164 0 578400 +e19200 1881503902 0 5127000 +e19800 2421701228 0 30100000 e20100 1071606918 0 29580000 -e20400 1463458474 0 10850000 +e20400 1463453704 0 10850000 e24515 515462282 0 11440000 e24518 298531730 0 20270000 -e26270 17404793928 -40760000 64980000 +e26270 17405193328 -40760000 64980000 e27200 23108666 -566300 795500 -e32800 29391792 0 6000 +e32800 29394792 0 6000 e58990 113676622 0 3515000 e62900 664909862 0 7316000 -e87521 39755330 0 10000 +e87521 39760260 0 10000 e87530 22532900 0 147200 elderly_dependents 21 0 1 -f2441 19006 0 7 -f6251 54655 0 1 -ffpos 281533 1 12 -fips 6902069 1 56 +f2441 19007 0 7 +f6251 54656 0 1 +ffpos 281535 1 12 +fips 6902096 1 56 g20500 17004763 0 720000 -h_seq 11813802248 2 94097 -k1bx14p -2191587638 -18990000 2341800 -k1bx14s -155295865 -7244500 5459500 -n1820 21899 0 3 +h_seq 11813820444 2 94097 +k1bx14p -2191478721 -18990000 2341800 +k1bx14s -155295712 -7244500 5459500 +n1820 21900 0 3 n21 367212 0 5 -n24 121996 0 9 -nu06 42824 0 4 +n24 121995 0 9 +nu06 42825 0 4 nu13 106112 0 7 -nu18 152752 0 9 +nu18 152751 0 9 p08000 810824 0 31600 -p22250 -630200978 -124900000 39410000 -p23250 23291182672 -28160000 91220000 -pencon_p 427118733 0 16500 -pencon_s 280486356 0 16500 -s006 18297348056 1 723334 +p22250 -630147878 -124900000 39410000 +p23250 23291162602 -28160000 91220000 +pencon_p 426421982 0 16500 +pencon_s 281566758 0 16500 +s006 18297348060 1 723334 diff --git a/tests/test_data.py b/tests/test_data.py index 70450c81..e7a8424a 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -83,7 +83,7 @@ def relationships(data, dataname): else: # see Note (2) in docstring m = "Number of records where n24 > nu18 has changed" - assert (data["n24"] > data["nu18"]).sum() == 9692, m + assert (data["n24"] > data["nu18"]).sum() == 9691, m subdata = data[data["n24"] > data["nu18"]] m = "n24 > nu18 + 3" assert np.all(subdata["n24"] <= subdata["nu18"] + 3), m