From 420a996793b52b4f4f371f0ef97affde8407453e Mon Sep 17 00:00:00 2001 From: jessegrabowski Date: Wed, 17 Jan 2024 16:32:15 +0100 Subject: [PATCH] Remove extra rows from `factor_tax.csv` --- .../Tests and Ohter/Factor Tax Test.ipynb | 18 +++++----- notebooks/data/factor_tax.csv | 36 +++++++++---------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/notebooks/Tests and Ohter/Factor Tax Test.ipynb b/notebooks/Tests and Ohter/Factor Tax Test.ipynb index 4800bdd..74faf89 100644 --- a/notebooks/Tests and Ohter/Factor Tax Test.ipynb +++ b/notebooks/Tests and Ohter/Factor Tax Test.ipynb @@ -32,14 +32,14 @@ "metadata": {}, "outputs": [], "source": [ - "df = pd.read_csv(\"../data/factor_tax.csv\", index_col=[0, 1], header=[0, 1]).fillna(0).iloc[:-4, :-1]\n", + "df = pd.read_csv(\"../data/factor_tax.csv\", index_col=[0, 1], header=[0, 1]).fillna(0)\n", "np.testing.assert_allclose(df.sum(axis=0).values, df.sum(axis=1).values)" ] }, { "cell_type": "code", "execution_count": 3, - "id": "512e3293", + "id": "e8b1f800", "metadata": {}, "outputs": [], "source": [ @@ -312,7 +312,7 @@ { "cell_type": "code", "execution_count": 6, - "id": "8e8dd421", + "id": "e4ecd6b9", "metadata": { "scrolled": false }, @@ -392,7 +392,7 @@ { "cell_type": "code", "execution_count": 7, - "id": "77bac634", + "id": "4fe5c70c", "metadata": {}, "outputs": [], "source": [ @@ -507,7 +507,7 @@ { "cell_type": "code", "execution_count": 9, - "id": "fa13219e", + "id": "74b25aa3", "metadata": {}, "outputs": [ { @@ -910,7 +910,7 @@ { "cell_type": "code", "execution_count": 11, - "id": "7a02c34c", + "id": "1a08ddfd", "metadata": {}, "outputs": [ { @@ -1010,7 +1010,7 @@ { "cell_type": "code", "execution_count": 13, - "id": "3789996c", + "id": "2ec63303", "metadata": {}, "outputs": [ { @@ -1031,7 +1031,7 @@ { "cell_type": "code", "execution_count": 15, - "id": "faa68760", + "id": "cbe11b70", "metadata": {}, "outputs": [ { @@ -1058,7 +1058,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c11d2040", + "id": "279d14c2", "metadata": {}, "outputs": [], "source": [] diff --git a/notebooks/data/factor_tax.csv b/notebooks/data/factor_tax.csv index 95fd046..270add2 100644 --- a/notebooks/data/factor_tax.csv +++ b/notebooks/data/factor_tax.csv @@ -1,20 +1,16 @@ -,,Factor,Factor,Institution,Institution,Production,Production,Activities,Activities,Income Tax,Sales Tax,Sales Tax,Use Tax,Use Tax,Other, -,,Labor,Capital,Household,Govt,Milk,Bread,Milk,Bread,Household,Milk,Bread,Labor,Capital,Investment, -Factor,Labor,,,,,,,2000,6000,,,,,,,8000 -Factor,Capital,,,,,,,2500,700,,,,,,,3200 -Institution,Household,8000,3200,,,,,,,,,,,,,11200 -Institution,Govt,,,,,,,,,800,300,1000,1700,1500,,5300 -Production,Milk,,,2000,4000,,,1500,700,,,,,,1000,9200 -Production,Bread,,,5830,1170,,,1700,1100,,,,,,400,10200 -Activities,Milk,,,,,7700,,,,,,,,,,7700 -Activities,Bread,,,,,,8500,,,,,,,,,8500 -Income Tax,Household,,,800,,,,,,,,,,,,800 -Sales Tax,Milk,,,300,,,,,,,,,,,,300 -Sales Tax,Bread,,,1000,,,,,,,,,,,,1000 -Use Tax,Labor,,,,,500,1200,,,,,,,,,1700 -Use Tax,Capital,,,,,1000,500,,,,,,,,,1500 -Other,Investment,,,1270,130,,,,,,,,,,,1400 -,,,,,,,,,,,,,,,, -,,8000,3200,11200,5300,9200,10200,7700,8500,800,300,1000,1700,1500,1400, -,,,,,,,,,,,,,,,, -,,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +,,Factor,Factor,Institution,Institution,Production,Production,Activities,Activities,Income Tax,Sales Tax,Sales Tax,Use Tax,Use Tax,Other +,,Labor,Capital,Household,Govt,Milk,Bread,Milk,Bread,Household,Milk,Bread,Labor,Capital,Investment +Factor,Labor,,,,,,,2000,6000,,,,,, +Factor,Capital,,,,,,,2500,700,,,,,, +Institution,Household,8000,3200,,,,,,,,,,,, +Institution,Govt,,,,,,,,,800,300,1000,1700,1500, +Production,Milk,,,2000,4000,,,1500,700,,,,,,1000 +Production,Bread,,,5830,1170,,,1700,1100,,,,,,400 +Activities,Milk,,,,,7700,,,,,,,,, +Activities,Bread,,,,,,8500,,,,,,,, +Income Tax,Household,,,800,,,,,,,,,,, +Sales Tax,Milk,,,300,,,,,,,,,,, +Sales Tax,Bread,,,1000,,,,,,,,,,, +Use Tax,Labor,,,,,500,1200,,,,,,,, +Use Tax,Capital,,,,,1000,500,,,,,,,, +Other,Investment,,,1270,130,,,,,,,,,,