Merge branch 'master' into update-intercomparison

nasaharvest · Sep 5, 2023 · 549913c · 549913c
2 parents a98a1ef + fc63975
commit 549913c
Show file tree

Hide file tree

Showing 11 changed files with 2,635 additions and 93 deletions.
diff --git a/.github/ISSUE_TEMPLATE/cropmap-generation.md b/.github/ISSUE_TEMPLATE/cropmap-generation.md
@@ -11,6 +11,7 @@ assignees: ''
 - [ ] [Set 1]() Labeling
 - [ ] [Set 2]() Labeling
 - [ ] Data added to repository
+- [ ] Data added to intercomparison
 - [ ] Model trained
 - [ ] Map made
 - [ ] Expert check
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.1.1
+    rev: v1.4.1
     hooks:
     -   id: mypy
         args: [--no-strict-optional]

diff --git a/data/all_dataset_params.json b/data/all_dataset_params.json
@@ -458,6 +458,156 @@
             12
         ]
     },
+    "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_CEO_2019,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019,Namibia_corrective_labels_2020,Malawi_corrected,Namibia_CEO_2020,Namibia_WFP,Sudan_Blue_Nile_CEO_2019,Hawaii_CEO_2020,HawaiiAgriculturalLandUse2020,KenyaCEO2019,HawaiiCorrective2020,HawaiiCorrectiveGuided2020,MalawiCorrectiveLabels2020,NamibiaFieldBoundary2022,SudanBlueNileCEO2020,SudanBlueNileCorrectiveLabels2019_February_2022": {
+        "normalizing_dict": {
+            "mean": [
+                -11.010597629614267,
+                -17.93315934142609,
+                1378.2978125266088,
+                1328.6964602223075,
+                1322.884621471166,
+                1566.8207932889168,
+                2366.718846106888,
+                2754.3006206627592,
+                2641.1031474777196,
+                3014.0920773968824,
+                792.3412644439321,
+                2338.3983212157955,
+                1506.7912934630426,
+                288.78254624669995,
+                0.003701980080560818,
+                860.8552925413142,
+                5.744312274120629,
+                0.3613212869925251
+            ],
+            "std": [
+                4.052190929484339,
+                4.853169882857092,
+                1023.8963950726392,
+                974.1216238230556,
+                1152.4407343698576,
+                1102.8347099301604,
+                1055.6941473402348,
+                1121.517056595048,
+                1074.5190205815538,
+                1143.2850676506323,
+                643.3376730019947,
+                1006.9829254193263,
+                886.699505536348,
+                38.449714731667456,
+                0.004337666658650211,
+                669.3151973014602,
+                7.047812171489939,
+                0.23016446139047195
+            ]
+        },
+        "train_num_timesteps": [
+            12
+        ],
+        "val_num_timesteps": [
+            12
+        ]
+    },
+    "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_CEO_2019,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019,Namibia_corrective_labels_2020,Malawi_corrected,Namibia_CEO_2020,Namibia_WFP,Sudan_Blue_Nile_CEO_2019,Hawaii_CEO_2020,HawaiiAgriculturalLandUse2020,KenyaCEO2019,HawaiiCorrective2020,HawaiiCorrectiveGuided2020,MalawiCorrectiveLabels2020,NamibiaFieldBoundary2022,SudanBlueNileCorrectiveLabels2019_February_2022": {
+        "normalizing_dict": {
+            "mean": [
+                -10.988981592257796,
+                -17.91244951696709,
+                1379.010073722385,
+                1328.800625164217,
+                1321.1702728103958,
+                1565.728200588372,
+                2369.441562134159,
+                2758.036597326127,
+                2644.077105402087,
+                3017.309074976321,
+                792.5015863916065,
+                2329.992982560734,
+                1499.7820606633395,
+                288.6535072848313,
+                0.003729130057286396,
+                859.7559485672582,
+                5.792173617085315,
+                0.36266787286045654
+            ],
+            "std": [
+                4.059189531023125,
+                4.8608918159160215,
+                1029.7706249157943,
+                979.3127275583205,
+                1157.9887887421285,
+                1108.278469841328,
+                1060.5272404944055,
+                1126.1002732322274,
+                1079.0033339478161,
+                1147.7134338496564,
+                646.0887764768584,
+                1004.5736818679163,
+                884.5745788305717,
+                38.699865733404884,
+                0.004349719128436055,
+                673.1310168994868,
+                7.079269671174511,
+                0.23065168255519425
+            ]
+        },
+        "train_num_timesteps": [
+            12
+        ],
+        "val_num_timesteps": [
+            12
+        ]
+    },
+    "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_CEO_2019,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019,Namibia_corrective_labels_2020,Malawi_corrected,Namibia_CEO_2020,Namibia_WFP,Sudan_Blue_Nile_CEO_2019,Hawaii_CEO_2020,HawaiiAgriculturalLandUse2020,KenyaCEO2019,HawaiiCorrective2020,HawaiiCorrectiveGuided2020,MalawiCorrectiveLabels2020,NamibiaFieldBoundary2022_February_2022": {
+        "normalizing_dict": {
+            "mean": [
+                -11.00434924866183,
+                -17.928923477652454,
+                1379.5880177229285,
+                1329.6320634566941,
+                1322.7398635795187,
+                1567.443830476057,
+                2370.043718668107,
+                2758.341560740495,
+                2645.2840062642676,
+                3018.235839856404,
+                795.3015255817961,
+                2336.7853120091363,
+                1505.3290896753745,
+                288.6547215850901,
+                0.0037224423081774908,
+                862.8474249518085,
+                5.76712443674822,
+                0.36245228607107716
+            ],
+            "std": [
+                4.0585149696749765,
+                4.856382951881445,
+                1028.6943955444208,
+                978.5584713259958,
+                1157.1235941909872,
+                1107.504289487754,
+                1059.2358298317542,
+                1124.5772811784689,
+                1077.41733079215,
+                1146.0235958785781,
+                645.6734935500274,
+                1008.0418161969949,
+                887.9919233737181,
+                38.64446823499577,
+                0.004348983441115916,
+                670.6670679861483,
+                7.060310493349738,
+                0.2301550539432894
+            ]
+        },
+        "train_num_timesteps": [
+            12
+        ],
+        "val_num_timesteps": [
+            12
+        ]
+    },
     "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_CEO_2019,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019,Namibia_corrective_labels_2020,Malawi_corrected,Namibia_CEO_2020,Namibia_WFP,Sudan_Blue_Nile_CEO_2019,Hawaii_CEO_2020,HawaiiAgriculturalLandUse2020,KenyaCEO2019,HawaiiCorrective2020,HawaiiCorrectiveGuided2020,MalawiCorrectiveLabels2020_February_2022": {
         "normalizing_dict": {
             "mean": [
@@ -558,6 +708,56 @@
             12
         ]
     },
+    "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_CEO_2019,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019,Namibia_corrective_labels_2020,Malawi_corrected,Namibia_CEO_2020,Namibia_WFP,Sudan_Blue_Nile_CEO_2019,Hawaii_CEO_2020_February_2022": {
+        "normalizing_dict": {
+            "mean": [
+                -11.102590132528618,
+                -18.04280085793947,
+                1412.8458557130932,
+                1362.805624644477,
+                1368.7888937423854,
+                1606.0164803250568,
+                2380.775196001537,
+                2757.3848472889254,
+                2642.7892757933737,
+                3012.0405061894785,
+                813.2763850206367,
+                2371.0652862121815,
+                1540.221544289527,
+                292.96293071703417,
+                0.0036823430639843445,
+                894.4728889332766,
+                5.77291795508119,
+                0.3509678607050165
+            ],
+            "std": [
+                4.149040589436702,
+                4.968289902355385,
+                1076.8589724406017,
+                1022.8510967887388,
+                1205.0613224098117,
+                1157.0185454939142,
+                1094.2510599138282,
+                1146.2531635210094,
+                1095.1266669105394,
+                1159.2485105175083,
+                674.6272675369021,
+                1027.0844300275187,
+                903.0408777036678,
+                15.179218776176244,
+                0.004075710772599314,
+                686.643649178275,
+                7.213693858069893,
+                0.22617639933841938
+            ]
+        },
+        "train_num_timesteps": [
+            12
+        ],
+        "val_num_timesteps": [
+            12
+        ]
+    },
     "geowiki_landcover_2017,Kenya,Mali,Mali_lower_CEO_2019,Mali_upper_CEO_2019,Togo,Rwanda,Uganda,open_buildings,digitalearthafrica_eastern,digitalearthafrica_sahel,Ethiopia,Ethiopia_Tigray_2020,Ethiopia_Tigray_2021,Ethiopia_Bure_Jimma_2019,Ethiopia_Bure_Jimma_2020,Argentina_Buenos_Aires,Malawi_CEO_2020,Malawi_FAO,Malawi_FAO_corrected,Zambia_CEO_2019,Tanzania_CEO_2019_February_2022": {
         "normalizing_dict": {
             "mean": [

diff --git a/data/datasets.dvc b/data/datasets.dvc
@@ -1,6 +1,6 @@
 outs:
-- md5: 5306670e5785fedb91f48f55b6c9e111.dir
-  size: 720814523
+- md5: 5e9f23a90c0dd631f249251ac7b68f26.dir
+  size: 659946253
   nfiles: 46
   path: datasets
   hash: md5
diff --git a/data/models.dvc b/data/models.dvc
@@ -1,6 +1,6 @@
 outs:
-- md5: a078950f38d7c3e356956b5888363c15.dir
-  size: 64012214
-  nfiles: 48
+- md5: 5af501919bc9f6c4f21b17c937e8bf45.dir
+  size: 71619264
+  nfiles: 52
   path: models
   hash: md5
diff --git a/data/raw.dvc b/data/raw.dvc
@@ -1,6 +1,6 @@
 outs:
-- md5: b9b59042e8cc21a599845fbf446cdd3c.dir
-  size: 440175010
-  nfiles: 373
+- md5: f63283bc4a661fb36f405f0dc99da064.dir
+  size: 442919107
+  nfiles: 382
   path: raw
   hash: md5
diff --git a/data/report.txt b/data/report.txt
@@ -121,12 +121,12 @@ eo_data_export_failed        1
 
 
 
-Ethiopia (Timesteps: 24,15)
+Ethiopia (Timesteps: 24)
 ----------------------------------------------------------------------------
 disagreement: 0.0%
-eo_data_complete     3651
-eo_data_duplicate     862
-✔ training amount: 3651, positive class: 55.1%
+eo_data_complete     3649
+eo_data_duplicate     864
+✔ training amount: 3649, positive class: 55.0%
 
 
 
@@ -140,13 +140,13 @@ eo_data_skipped      173
 
 
 
-Ethiopia_Tigray_2021 (Timesteps: 20)
+Ethiopia_Tigray_2021 (Timesteps: 24)
 ----------------------------------------------------------------------------
 disagreement: 19.0%
 eo_data_complete    718
 eo_data_skipped     168
-✔ validation amount: 354, positive class: 30.8%
-✔ testing amount: 364, positive class: 29.9%
+✔ validation amount: 351, positive class: 27.9%
+✔ testing amount: 367, positive class: 32.7%
 
 
 
@@ -170,16 +170,6 @@ eo_data_skipped     262
 
 
 
-Argentina_Buenos_Aires (Timesteps: 15)
-----------------------------------------------------------------------------
-disagreement: 0.0%
-eo_data_complete     566
-eo_data_duplicate     92
-✔ training amount: 457, positive class: 48.1%
-✔ validation amount: 109, positive class: 45.0%
-
-
-
 Malawi_CEO_2020 (Timesteps: 24)
 ----------------------------------------------------------------------------
 disagreement: 21.1%
@@ -297,6 +287,17 @@ eo_data_skipped       82
 
 
 
+Senegal_CEO_2022 (Timesteps: 16)
+----------------------------------------------------------------------------
+disagreement: 10.5%
+eo_data_complete    1342
+eo_data_skipped      158
+✔ training amount: 276, positive class: 4.7%
+✔ validation amount: 516, positive class: 6.6%
+✔ testing amount: 550, positive class: 10.7%
+
+
+
 HawaiiAgriculturalLandUse2020 (Timesteps: 24)
 ----------------------------------------------------------------------------
 eo_data_complete     4834
@@ -334,13 +335,6 @@ eo_data_complete    4295
 
 
 
-NamibiaFieldBoundary2022 (Timesteps: 23)
-----------------------------------------------------------------------------
-eo_data_complete    12451
-✔ training amount: 12451, positive class: 55.3%
-
-
-
 EthiopiaTigrayGhent2021 (Timesteps: 24)
 ----------------------------------------------------------------------------
 eo_data_complete    161
@@ -398,7 +392,7 @@ eo_data_complete    1500
 
 
 
-NamibiaNorthStratified2020 (Timesteps: 13)
+NamibiaNorthStratified2020 (Timesteps: 24)
 ----------------------------------------------------------------------------
 eo_data_complete    1350
 ✔ validation amount: 681, positive class: 0.1%