Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added all of Lukasz's code #5

Merged
merged 21 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
edf2f2d
Removed old tests
florianjehn Dec 8, 2023
0fe8607
linting stuff
florianjehn Dec 8, 2023
ca7e7f2
Merge branch 'allfed:main' into main
florianjehn Dec 8, 2023
957fb52
weird temp code to take care of country codes before I realized they …
florianjehn Dec 13, 2023
322120c
excluded the data files
florianjehn Dec 13, 2023
dac0d73
Delete data/data_raw/Production_Crops_Livestock_E_All_Data.zip
florianjehn Dec 13, 2023
01bd4fa
Delete data/data_raw/Production_Crops_Livestock_E_Oceania.zip
florianjehn Dec 13, 2023
95fbee6
Delete data/data_raw/Trade_DetailedTradeMatrix_E_Oceania.zip
florianjehn Dec 13, 2023
c1cb839
Create readme.txt
florianjehn Dec 13, 2023
563a0ef
Merge branch 'main' of https://github.com/florianjehn/pytradeshifts
florianjehn Dec 13, 2023
efb6802
Deleting temp files
florianjehn Dec 13, 2023
66cea8b
Added pickle explainer
florianjehn Dec 13, 2023
3825787
Update LICENSE
florianjehn Dec 13, 2023
24873b7
Updated the validation data and included csv files again
florianjehn Dec 14, 2023
eddcdcd
Merge branch 'main' of https://github.com/florianjehn/pytradeshifts
florianjehn Dec 14, 2023
2ae7879
Finished implementing the test for Oceania dataset
florianjehn Dec 15, 2023
43098f5
Almost fixed test for the whole dataset
florianjehn Dec 15, 2023
630a989
test
florianjehn Dec 15, 2023
92fec9d
Files from R and Python are finally the same
florianjehn Jan 10, 2024
870f15b
Added all the tests for re-export and so on
florianjehn Jan 10, 2024
c7ba922
Made tests less redundant
florianjehn Jan 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 3 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,33 +127,7 @@ dmypy.json

# Pyre type checker
.pyre/
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_All_Data_(Normalized)/Trade_DetailedTradeMatrix_E_All_Data_(Normalized).csv
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_All_Data_(Normalized)/Trade_DetailedTradeMatrix_E_AreaCodes.csv
.gitignore
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_All_Data_(Normalized)/Trade_DetailedTradeMatrix_E_Flags.csv
.gitignore
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania/Trade_DetailedTradeMatrix_E_AreaCodes.csv
.gitignore
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania/Trade_DetailedTradeMatrix_E_Oceania.csv
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania/Trade_DetailedTradeMatrix_E_ItemCodes.csv
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania/Trade_DetailedTradeMatrix_E_Flags.csv
.gitignore
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_All_Data_(Normalized)/Trade_DetailedTradeMatrix_E_ItemCodes.csv
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania/Trade_DetailedTradeMatrix_E_Oceania_NOFLAG.csv
.gitignore
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_Oceania.zip
data/FAO_trade_matrix/Trade_DetailedTradeMatrix_E_All_Data_(Normalized).zip
data/oceania_only_for_testing/Trade_DetailedTradeMatrix_E_AreaCodes.csv
data/oceania_only_for_testing/Trade_DetailedTradeMatrix_E_Flags.csv
data/oceania_only_for_testing/Trade_DetailedTradeMatrix_E_ItemCodes.csv
data/oceania_only_for_testing/Trade_DetailedTradeMatrix_E_Oceania_NOFLAG.csv
data/oceania_only_for_testing/Trade_DetailedTradeMatrix_E_Oceania.csv
data/Trade_DetailedTradeMatrix_E_All_Data/Trade_DetailedTradeMatrix_E_All_Data_NOFLAG.csv
data/Trade_DetailedTradeMatrix_E_All_Data/Trade_DetailedTradeMatrix_E_All_Data.csv
data/Trade_DetailedTradeMatrix_E_All_Data/Trade_DetailedTradeMatrix_E_AreaCodes.csv
data/Trade_DetailedTradeMatrix_E_All_Data/Trade_DetailedTradeMatrix_E_Flags.csv
data/Trade_DetailedTradeMatrix_E_All_Data/Trade_DetailedTradeMatrix_E_ItemCodes.csv
data/data_raw/Trade_DetailedTradeMatrix_E_All_Data.zip

# Ignores all pickle files

*.pkl
*.zip

13 changes: 1 addition & 12 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,7 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2024 Florian Ulrich Jehn

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions data/data_raw/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop FAO production and trade zips here.
197 changes: 197 additions & 0 deletions data/preprocessed_data/Maize_Y2021_Global_production.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
,Value
Afghanistan,180000.0
Albania,414270.8
Algeria,18491.0
Angola,2970208.0
Antigua and Barbuda,10.68
Caribbean,502699.09
Azerbaijan,279248.3
Argentina,60525805.0
Australia,305655.87
Austria,2434900.0
Bahamas,668.49
Bahrain,0.0
Bangladesh,4116438.0
Armenia,6000.0
Barbados,49.9
Belgium,449890.0
Micronesia,91.81
Bhutan,30938.64
Bolivia (Plurinational State of),1224719.66
Bosnia and Herzegovina,893124.0
Botswana,67436.11
Brazil,88461943.0
Belize,108743.0
Solomon Islands,0.0
Brunei Darussalam,0.0
Bulgaria,3427310.0
Myanmar,2300000.0
Burundi,280000.0
Belarus,1148000.0
Cambodia,920000.0
Cameroon,2100146.82
Canada,13983859.0
Cabo Verde,449.0
Central African Republic,90000.0
Sri Lanka,472443.9
Chile,793821.78
China; mainland,272552000.0
China; Taiwan Province of,210124.0
Colombia,1591400.0
Comoros,6288.7
Congo,13000.0
Democratic Republic of the Congo,2243379.0
Cook Islands,0.0
Costa Rica,6246.0
Croatia,2242120.0
Cuba,238721.0
Cyprus,0.0
Czechia,988040.0
Benin,1628148.88
Denmark,45270.0
Dominica,193.43
Dominican Republic,54725.12
Ecuador,1699369.61
El Salvador,881000.0
Equatorial Guinea,0.0
Ethiopia,10722000.0
Eritrea,20000.0
Estonia,0.0
Faroe Islands,0.0
Fiji,1438.0
Finland,0.0
France,15358300.0
French Polynesia,0.0
Djibouti,16.99
Gabon,45172.92
Georgia,233000.0
Gambia,20000.0
Palestine,0.0
Germany,4462400.0
Ghana,3500000.0
Kiribati,0.0
Greece,1322940.0
Grenada,382.66
Guatemala,1960000.0
Guinea,798327.0
Guyana,4000.0
Haiti,200000.0
Honduras,673592.27
China; Hong Kong SAR,0.0
Hungary,6424630.0
Iceland,0.0
India,31650000.0
Indonesia,20010000.0
Iran (Islamic Republic of),320169.71
Iraq,374400.0
Ireland,0.0
Israel,68224.0
Italy,6079960.0
Côte d'Ivoire,1140000.0
Jamaica,2122.0
Japan,166.5
Kazakhstan,1129508.48
Jordan,25000.0
Kenya,3303000.0
Republic of Korea,78000.0
Kuwait,12833.0
Kyrgyzstan,691139.0
Lao People's Democratic Republic,1050000.0
Lebanon,3000.0
Lesotho,90000.0
Latvia,0.0
Liberia,0.0
Libya,3452.03
Lithuania,104680.0
Luxembourg,460.0
China; Macao SAR,0.0
Madagascar,232026.0
Malawi,4581000.0
Malaysia,74718.65
Maldives,143.75
Mali,3603000.0
Malta,0.0
Mauritania,12000.0
Mauritius,1106.0
Mexico,27503477.82
Mongolia,0.0
Republic of Moldova,2792700.0
Montenegro,2584.03
Morocco,48637.3
Mozambique,2100000.0
Oman,15545.0
Namibia,91869.0
Nauru,0.0
Nepal,2997733.0
Netherlands (Kingdom of the),171420.0
New Caledonia,7417.0
Vanuatu,915.96
New Zealand,209281.0
Nicaragua,375726.0
Niger,5681.0
Nigeria,12745000.0
Niue,0.0
Norway,0.0
Micronesia (Federated States of),91.81
Marshall Islands,0.0
Pakistan,10634831.0
Panama,135425.0
Papua New Guinea,12622.34
Paraguay,4088093.0
Peru,1582135.0
Philippines,8300321.8
Poland,7321910.0
Portugal,752490.0
Guinea-Bissau,16971.0
Timor-Leste,56058.0
Puerto Rico,24.02
Qatar,2809.0
Romania,14820690.0
Russian Federation,15239865.1
Rwanda,482682.0
Saint Kitts and Nevis,0.0
Saint Lucia,0.0
Saint Vincent and the Grenadines,801.78
Sao Tome and Principe,598.43
Saudi Arabia,59000.0
Senegal,754620.83
Serbia,6027130.66
Seychelles,0.0
Sierra Leone,22544.65
Singapore,0.0
Slovakia,1579120.0
Viet Nam,4446383.17
Slovenia,388830.0
Somalia,75000.0
South Africa,16870705.0
Zimbabwe,1469664.0
Spain,4597660.0
Sudan,23363.99
Suriname,27.0
Eswatini,100000.0
Sweden,14900.0
Switzerland,98216.0
Syrian Arab Republic,309841.4
Tajikistan,240000.0
Thailand,5300000.0
Togo,929000.0
Tonga,0.0
Trinidad and Tobago,5000.0
United Arab Emirates,23638.73
Tunisia,0.0
Türkiye,6750000.0
Turkmenistan,7699.22
Uganda,2800000.0
Ukraine,42109850.0
North Macedonia,134036.0
Egypt,7500000.0
United Kingdom of Great Britain and Northern Ireland,0.0
United Republic of Tanzania,7039000.0
United States of America,383943000.0
Burkina Faso,1913000.0
Uruguay,769600.0
Uzbekistan,590016.0
Venezuela (Bolivarian Republic of),1541647.87
Samoa,0.0
Yemen,35000.0
Zambia,3620243.9
Loading
Loading