From c384cada951b97ce4dd7d3f870782410955f3d4d Mon Sep 17 00:00:00 2001 From: dedenbangkit Date: Thu, 17 Oct 2024 16:01:53 +0700 Subject: [PATCH] [#11] Calculate ALB --- doc/table-proposal.ipynb | 194 ++++++++---------- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- ...d Dimensions = Basic + Safely Managed).csv | 4 +- output_data/table_graph_ifs.csv | 4 +- output_data/table_ifs.csv | 4 +- output_data/table_jmp.csv | 4 +- tests/ifs-testing.csv | 4 +- 13 files changed, 110 insertions(+), 132 deletions(-) diff --git a/doc/table-proposal.ipynb b/doc/table-proposal.ipynb index b2815b2..0447c5f 100644 --- a/doc/table-proposal.ipynb +++ b/doc/table-proposal.ipynb @@ -302,22 +302,14 @@ " '06. Poverty Headcount less than $2.15 per Day, Log Normal - Millions.csv',\n", " '08. State Failure Instability Event - IFs Index.csv',\n", " '11. Governance Effectiveness - WB index.csv',\n", - " '13. Sanitation Services, Access, percent of population (2nd Dimensions = Safely Managed).csv',\n", - " '13. Sanitation Services, Access, percent of population (2nd Dimensions = At Least Basic).csv',\n", - " '14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic).csv',\n", - " '14. Sanitation Services, Access, Number of people, million (2nd Dimensions = SafelyManaged).csv',\n", - " '15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic).csv',\n", - " '15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = SafelyManaged).csv',\n", - " '16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic).csv',\n", - " '16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = SafelyManaged).csv',\n", - " '17. Water Services, Access, percent of population (2nd Dimensions = Safely Managed).csv',\n", - " '17. Water Services, Access, percent of population (2nd Dimensions = At Least Basic).csv',\n", - " '18. Water Services, Access, Number of people, million (2nd Dimensions = Basic).csv',\n", - " '18. Water Services, Access, Number of people, million (2nd Dimensions = SafelyManaged).csv',\n", - " '19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic).csv',\n", - " '19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = SafelyManaged).csv',\n", - " '20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic).csv',\n", - " '20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = SafelyManaged).csv',\n", + " '13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv',\n", " '23. GDP (PPP) - Billion dollars.csv',\n", " '24. Stunted children, History and Forecast - Million.csv',\n", " '26. Malnourished Children, Headcount - Millions.csv',\n", @@ -326,10 +318,8 @@ " \"year_range\": {\n", " \"years\": list(range(2018, 2051)),\n", " \"files\": [\n", - " \"13. Sanitation Services, Access, percent of population (2nd Dimensions = Safely Managed).csv\",\n", - " \"13. Sanitation Services, Access, percent of population (2nd Dimensions = At Least Basic).csv\",\n", - " \"17. Water Services, Access, percent of population (2nd Dimensions = Safely Managed).csv\",\n", - " \"17. Water Services, Access, percent of population (2nd Dimensions = At Least Basic).csv\"\n", + " '13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv',\n", + " '17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv',\n", " ]\n", " },\n", " \"milestone_years\": [2019, 2030, 2050] # 2019 for initial only but we remove them after get it\n", @@ -555,16 +545,23 @@ { "cell_type": "code", "execution_count": 26, - "id": "2430f1c7-5531-4159-9e12-0e8373a275ca", + "id": "5e0f3979-0eef-4bda-9846-64e6f18dc80e", "metadata": {}, "outputs": [], "source": [ - "def get_alb_or_sm_from_filename(fname):\n", - " if \"At Least Basic\" in fname:\n", - " return \"Basic\"\n", - " if \"Safely Managed\" in fname:\n", - " return \"SafelyManaged\"\n", - " return None" + "def get_alb_value(x, df):\n", + " if x[\"category_base\"] == \"Basic\":\n", + " additional_value = df[\n", + " (df[\"indicator\"] == x[\"indicator\"]) & \n", + " (df[\"year\"] == x[\"year\"]) & \n", + " (df[\"country\"] == x[\"country\"]) & \n", + " (df[\"commitment\"] == x[\"commitment\"]) &\n", + " (df[\"jmp_category\"] == x[\"jmp_category\"]) &\n", + " (df[\"category_base\"] == \"SafelyManaged\")\n", + " ]\n", + " if not additional_value.empty:\n", + " return x[\"value\"] + additional_value[\"value\"].iloc[0]\n", + " return x[\"value\"]" ] }, { @@ -599,22 +596,14 @@ "[OTHER]: ../input_data/IFs/06. Poverty Headcount less than $2.15 per Day, Log Normal - Millions.csv\n", "[OTHER]: ../input_data/IFs/08. State Failure Instability Event - IFs Index.csv\n", "[OTHER]: ../input_data/IFs/11. Governance Effectiveness - WB index.csv\n", - "[WASH] : ../input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Safely Managed).csv\n", - "[WASH] : ../input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = At Least Basic).csv\n", - "[WASH] : ../input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = SafelyManaged).csv\n", - "[WASH] : ../input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = SafelyManaged).csv\n", - "[WASH] : ../input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = SafelyManaged).csv\n", - "[WASH] : ../input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Safely Managed).csv\n", - "[WASH] : ../input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = At Least Basic).csv\n", - "[WASH] : ../input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = SafelyManaged).csv\n", - "[WASH] : ../input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = SafelyManaged).csv\n", - "[WASH] : ../input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic).csv\n", - "[WASH] : ../input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = SafelyManaged).csv\n", + "[WASH] : ../input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv\n", + "[WASH] : ../input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv\n", "[OTHER]: ../input_data/IFs/23. GDP (PPP) - Billion dollars.csv\n", "[OTHER]: ../input_data/IFs/24. Stunted children, History and Forecast - Million.csv\n", "[OTHER]: ../input_data/IFs/26. Malnourished Children, Headcount - Millions.csv\n" @@ -637,13 +626,12 @@ " df = pd.DataFrame(data.to_dict('records'))\n", " df_melted = df.melt(id_vars=['Year'], var_name='variable', value_name='value')\n", " new_data = []\n", - " category_base = get_alb_or_sm_from_filename(file)\n", " for value_list in df_melted.to_dict('records'):\n", " value_type = get_value_types(value_list[\"variable\"][3])\n", " new_data.append({\n", " \"year\": int(value_list[\"Year\"]),\n", " \"country\": map_country_name(value_list[\"variable\"][0]),\n", - " \"category_base\": category_base or value_list[\"variable\"][1],\n", + " \"category_base\": value_list[\"variable\"][1],\n", " \"unit\": value_list[\"variable\"][2],\n", " \"value_type\": list(filter(lambda v:v,value_type)),\n", " \"value\": value_list[\"value\"]\n", @@ -658,6 +646,8 @@ " df_final['indicator'] = get_ifs_name(file)\n", " df_final['jmp_category'] = df_final.apply(base_jmp_category, axis=1)\n", " df_final['jmp_category'] = df_final['jmp_category'].replace({\"BS\": \"ALB\"})\n", + " # Add Value for ALB\n", + " df_final.loc[:, 'value'] = df_final.apply(lambda x: get_alb_value(x, df_final), axis=1)\n", " # Add initial value column\n", " df_final['initial_value'] = np.nan\n", " df_final['base_value'] = np.nan\n", @@ -1890,66 +1880,66 @@ " \n", " 31965\n", " 2050\n", - " 0.205\n", - " 0.302\n", - " 0.087\n", + " 0.0003\n", + " 0.0004\n", " NaN\n", " NaN\n", + " NaN\n", + " 3\n", + " 10\n", " 2\n", - " 9\n", - " 1\n", - " 5\n", + " 4\n", " 2\n", - " 1\n", - " 18\n", + " 9\n", + " 3\n", " \n", " \n", " 31966\n", " 2050\n", - " 0.818\n", - " 0.11\n", - " 0.070\n", + " 62.01\n", + " 51.48\n", + " 24.22\n", " NaN\n", " NaN\n", " 1\n", - " 14\n", - " 1\n", - " 3\n", - " 2\n", - " 9\n", " 13\n", + " 6\n", + " 6\n", + " 2\n", + " 2\n", + " 23\n", " \n", " \n", " 31967\n", " 2050\n", - " 1.412\n", - " 1.494\n", + " 0.0004\n", + " 0.0004\n", " NaN\n", " NaN\n", " NaN\n", - " 3\n", - " 5\n", - " 4\n", - " 7\n", " 2\n", - " 4\n", - " 17\n", + " 10\n", + " 2\n", + " 5\n", + " 1\n", + " 1\n", + " 3\n", " \n", " \n", " 31968\n", " 2050\n", - " 0.412\n", - " 0.302\n", - " 0.087\n", + " 0.0008\n", + " 0.0008\n", " NaN\n", " NaN\n", + " NaN\n", + " 3\n", + " 10\n", " 2\n", - " 9\n", - " 1\n", - " 5\n", - " 2\n", + " 4\n", " 2\n", - " 18\n", + " 9\n", + " 4\n", " \n", " \n", " 31969\n", @@ -1972,25 +1962,25 @@ "" ], "text/plain": [ - " year value base_value initial_value 2030 2050 jmp_name_id \\\n", - "31965 2050 0.205 0.302 0.087 NaN NaN 2 \n", - "31966 2050 0.818 0.11 0.070 NaN NaN 1 \n", - "31967 2050 1.412 1.494 NaN NaN NaN 3 \n", - "31968 2050 0.412 0.302 0.087 NaN NaN 2 \n", - "31969 2050 0.143 0.178 NaN NaN NaN 3 \n", + " year value base_value initial_value 2030 2050 jmp_name_id \\\n", + "31965 2050 0.0003 0.0004 NaN NaN NaN 3 \n", + "31966 2050 62.01 51.48 24.22 NaN NaN 1 \n", + "31967 2050 0.0004 0.0004 NaN NaN NaN 2 \n", + "31968 2050 0.0008 0.0008 NaN NaN NaN 3 \n", + "31969 2050 0.143 0.178 NaN NaN NaN 3 \n", "\n", " indicator_id unit_id value_name_id jmp_category_id commitment_id \\\n", - "31965 9 1 5 2 1 \n", - "31966 14 1 3 2 9 \n", - "31967 5 4 7 2 4 \n", - "31968 9 1 5 2 2 \n", + "31965 10 2 4 2 9 \n", + "31966 13 6 6 2 2 \n", + "31967 10 2 5 1 1 \n", + "31968 10 2 4 2 9 \n", "31969 4 4 7 2 4 \n", "\n", " country_id \n", - "31965 18 \n", - "31966 13 \n", - "31967 17 \n", - "31968 18 \n", + "31965 3 \n", + "31966 23 \n", + "31967 3 \n", + "31968 4 \n", "31969 23 " ] }, @@ -2041,24 +2031,12 @@ "name": "stderr", "output_type": "stream", "text": [ - "/tmp/ipykernel_879307/2539192541.py:4: SettingWithCopyWarning: \n", - "A value is trying to be set on a copy of a slice from a DataFrame.\n", - "Try using .loc[row_indexer,col_indexer] = value instead\n", - "\n", - "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n", - " graph_with_id['actual_year'] = graph_with_id['year']\n", - "/tmp/ipykernel_879307/2539192541.py:5: SettingWithCopyWarning: \n", - "A value is trying to be set on a copy of a slice from a DataFrame.\n", - "Try using .loc[row_indexer,col_indexer] = value instead\n", - "\n", - "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n", - " graph_with_id['year'] = graph_with_id['year'].apply(lambda x: 2030 if x <= 2030 else 2050)\n", - "/tmp/ipykernel_879307/2539192541.py:6: SettingWithCopyWarning: \n", + "/tmp/ipykernel_578496/23261463.py:4: SettingWithCopyWarning: \n", "A value is trying to be set on a copy of a slice from a DataFrame.\n", "Try using .loc[row_indexer,col_indexer] = value instead\n", "\n", "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n", - " graph_with_id['value'] = graph_with_id.apply(lambda x: x['value'] if (x['2030'] is not np.nan or x['2050'] is not np.nan or base_value is np.nan) else np.nan, axis=1)\n" + " graph_with_id.loc[:, 'actual_year'] = graph_with_id['year']\n" ] } ], @@ -2066,9 +2044,9 @@ "# First Graph\n", "\n", "graph_with_id = table_with_id[table_with_id['indicator_id'].isin([7, 13])]\n", - "graph_with_id['actual_year'] = graph_with_id['year']\n", - "graph_with_id['year'] = graph_with_id['year'].apply(lambda x: 2030 if x <= 2030 else 2050)\n", - "graph_with_id['value'] = graph_with_id.apply(lambda x: x['value'] if (x['2030'] is not np.nan or x['2050'] is not np.nan or base_value is np.nan) else np.nan, axis=1)\n", + "graph_with_id.loc[:, 'actual_year'] = graph_with_id['year']\n", + "graph_with_id.loc[:, 'year'] = graph_with_id['year'].apply(lambda x: 2030 if x <= 2030 else 2050)\n", + "graph_with_id.loc[:, 'value'] = graph_with_id.apply(lambda x: x['value'] if (x['2030'] is not np.nan or x['2050'] is not np.nan or base_value is np.nan) else np.nan, axis=1)\n", "graph_with_id = graph_with_id[['actual_year','year','country_id','indicator_id','value_name_id','jmp_name_id','jmp_category_id','commitment_id','value']]\n", "\n", "# Duplicate Year 2030 so it can be shown in 2050\n", diff --git a/input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv index 02f4ae0..fd8a337 100644 --- a/input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/13. Sanitation Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fce6d9907cf3ccb778a0a3f9afe01e5008e1becf86fbf037b23ff7e89fab19ec -size 820386 +oid sha256:6f97e36de8c8f7aedd37352b262485cfbc76928c57bb597c7a987e137106e8c2 +size 818011 diff --git a/input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv index f0c0f30..59cd561 100644 --- a/input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/14. Sanitation Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dd7db06c726e9a8331998fbf315f8344853b54a91bc06761d08d97bef5fac13 -size 822180 +oid sha256:cad2a50f6b5cc60e6935da393d00cf420ee314f305e860202e8ffa2506c24273 +size 819805 diff --git a/input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv index 9928549..6b294f9 100644 --- a/input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/15. Sanitation Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11f3fc14f43d6ddd5bbc8ba1cafbc657758361927ff822e2811acf3bf354f567 -size 826964 +oid sha256:b35d1ec94a291ce88b22fa0d0e57428618cbb94a1460825e46d3801d490db4a4 +size 824589 diff --git a/input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv index b9a08af..5b85dfb 100644 --- a/input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/16. Sanitation Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef6decfa80eb1afafbee75cf00f359bed443a3d4162be28e276a6c7258d49e54 -size 828160 +oid sha256:a36419570f1b4fe4063ec244c5eb58a67b4c789c2a61d7cee6aaf1c6b24741df +size 825785 diff --git a/input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv index c33c6c1..9b91cd0 100644 --- a/input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/17. Water Services, Access, percent of population (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b7cdda1645bb29857066251b9ce3197d4f5a0eb0fb6a3b42a3fb011254db33f -size 820524 +oid sha256:09f30a5d77f955ba42e72d0dbaf9e75283810b3e8fbcbd78f1fa66c2f4eea70c +size 818149 diff --git a/input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv index e0dc276..b40ce34 100644 --- a/input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/18. Water Services, Access, Number of people, million (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5859a7206b71f7b23c4eaf634701b4375aac3ca24e41cac77df9d2e633a0abd -size 822318 +oid sha256:1fb1f61b3e912a24dc4c0346b351b1cc0eef22d4b1e7ae27214ef101cb492496 +size 819943 diff --git a/input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv index c25c17f..41ecb13 100644 --- a/input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/19. Water Services, Expenditure, Capital, Billion $ (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b267731dfe540a47cc113e6c909920ea5d7832af1c90db347acacbdb23ae99dc -size 827102 +oid sha256:08fff0cd69c1c980ed35380dd164cbf25ec8cee10da9dd6d891ba4dc5b398e98 +size 824727 diff --git a/input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv b/input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv index a214bc5..ec392db 100644 --- a/input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv +++ b/input_data/IFs/20. Water Services, Expenditure, Maintenance, Billion $ (2nd Dimensions = Basic + Safely Managed).csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f467cdcdbfc76b6f26a5eece4e5f6bfd756a2c1550787427ce58df74fc53749f -size 828298 +oid sha256:3495346f4dd2e8f52b0afbfaf51556819274f920db3f0f0aa3e28e4dfeb461f9 +size 825923 diff --git a/output_data/table_graph_ifs.csv b/output_data/table_graph_ifs.csv index 4435568..2765070 100644 --- a/output_data/table_graph_ifs.csv +++ b/output_data/table_graph_ifs.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e62903598ce7541b4e549662dfb04843df72428faab388e40326434ea4f12a7 -size 1403336 +oid sha256:e665f6c8daafbe58f0bcdf6092f3c0629017bddbe24714a7e9552a755c79687f +size 1403087 diff --git a/output_data/table_ifs.csv b/output_data/table_ifs.csv index 110a261..dfe21d9 100644 --- a/output_data/table_ifs.csv +++ b/output_data/table_ifs.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fa519772c980553c3f2d7065bb20817828df66bbaf84e8b67e7f6637f5b60d0 -size 1072266 +oid sha256:1633e895999ab8bec61264c3b1dc72aade2680f3a78b670719552df274fbf861 +size 1072033 diff --git a/output_data/table_jmp.csv b/output_data/table_jmp.csv index 5dd931f..507e6e5 100644 --- a/output_data/table_jmp.csv +++ b/output_data/table_jmp.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c62586e2d4c8389f6df6a3cc74c30f75f3410857f85c122ec9781cf1e32d278 -size 113678 +oid sha256:aa61bf2a7907a2d5ba2f66059bad593a139457d773e130cc2e50d7da99ce3334 +size 111449 diff --git a/tests/ifs-testing.csv b/tests/ifs-testing.csv index 162be5d..dd71fcc 100644 --- a/tests/ifs-testing.csv +++ b/tests/ifs-testing.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1530d1ac192e88012d8c0ca3e39333c1fed6fcdc979dd3d8e89e84dfa4b1521a -size 3317039 +oid sha256:1be9591215d28b72761e3b48a789e58d9cf374741910b6b8383b1422e2b6c416 +size 3316766