Merge pull request #74 from steeleb/main

Methods/Summary updated, GTB complete for all missions
rossyndicate · Feb 2, 2024 · 3bf013c · 3bf013c
2 parents f88be3b + 25c4315
commit 3bf013c
Show file tree

Hide file tree

Showing 7 changed files with 391 additions and 260 deletions.
diff --git a/Methods_Results_Summary.Rmd b/Methods_Results_Summary.Rmd
diff --git a/Methods_Results_Summary.html b/Methods_Results_Summary.html
diff --git a/data/output/GTB_2024-01-08_l9_confusion.csv b/data/output/GTB_2024-01-08_l9_confusion.csv
@@ -0,0 +1,6 @@
+class,cloud,openWater,lightNearShoreSediment,offShoreSediment,darkNearShoreSediment,mission
+cloud,59,1,0,0,0,Landsat 9
+openWater,0,16,0,4,0,Landsat 9
+lightNearShoreSediment,1,0,22,6,2,Landsat 9
+offShoreSediment,0,0,2,30,0,Landsat 9
+darkNearShoreSediment,0,0,2,4,7,Landsat 9
diff --git a/data/output/GTB_2024-01-08_l9_training_confusion.csv b/data/output/GTB_2024-01-08_l9_training_confusion.csv
@@ -0,0 +1,6 @@
+class,cloud,openWater,lightNearShoreSediment,offShoreSediment,darkNearShoreSediment,mission
+cloud,124,0,0,0,0,Landsat 9
+openWater,0,47,0,2,0,Landsat 9
+lightNearShoreSediment,0,0,60,5,1,Landsat 9
+offShoreSediment,0,1,0,75,1,Landsat 9
+darkNearShoreSediment,0,0,3,1,22,Landsat 9
diff --git a/data/output/GTB_LS9_2024-01-08_performance_stats.csv b/data/output/GTB_LS9_2024-01-08_performance_stats.csv
@@ -0,0 +1,2 @@
+satellite,cloud,openWater,lightNearShoreSediment,offShoreSediment,darkNearShoreSediment,GTB_accuracy,GTB_kappa
+Landsat 9,0.9833333333333333,0.8648648648648648,0.7719298245614036,0.7894736842105263,0.6363636363636364,0.8589743589743589,0.8100193744810407
diff --git a/modeling/07_Landsat_9_GTB.Rmd b/modeling/07_Landsat_9_GTB.Rmd
@@ -74,7 +74,7 @@ ee.Initialize(project = 'ee-ross-superior')
 
 These assets were created in the 03_Train_Test_Split.Rmd file
 
-```{r}
+```{python}
 training_ls9 = ee.FeatureCollection("projects/ee-ross-superior/assets/train-test/training_ls9")
 testing_ls9 = ee.FeatureCollection("projects/ee-ross-superior/assets/train-test/testing_ls9")
 ```
@@ -165,8 +165,8 @@ the df.copy() function unlinks the original list from the new one. Silly python.
 ```{python}
 accuracy_heads = class_values.copy()
 accuracy_heads.extend(['GTB_accuracy', 'GTB_kappa'])
-landsat5_perf = fs_GTB_ls9.copy()
-landsat5_perf.extend([acc_values_GTB_ls9, k_GTB_ls9])
+landsat9_perf = fs_GTB_ls9.copy()
+landsat9_perf.extend([acc_values_GTB_ls9, k_GTB_ls9])
 
 performance_collation = pd.DataFrame(
   [landsat9_perf],
@@ -544,7 +544,7 @@ for d in range(date_length_9):
   #Check how many existing tasks are running and take a break of 5 mins if it's >10
   maximum_no_of_tasks(10, 5*60)
   #Send next task.
-    export_image.start()
+  export_image.start()
 
 ```
 

diff --git a/pySetup.R b/pySetup.R
@@ -1,5 +1,6 @@
 
-try(install_miniconda())
+options(timeout = 1000)
+try(install_miniconda(force = T))
 
 # list python modules
 py_modules = c('earthengine-api', 'pandas', 'xarray', 'rasterio', 'rioxarray', 'fiona', 'geopandas', 'geemap')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		satellite,cloud,openWater,lightNearShoreSediment,offShoreSediment,darkNearShoreSediment,GTB_accuracy,GTB_kappa
		Landsat 9,0.9833333333333333,0.8648648648648648,0.7719298245614036,0.7894736842105263,0.6363636363636364,0.8589743589743589,0.8100193744810407