update analysis for petroleum threat and update report

inSilecoInc · Nov 12, 2024 · b68e88a · b68e88a
1 parent f7bc095
commit b68e88a
Show file tree

Hide file tree

Showing 17 changed files with 961 additions and 458 deletions.
diff --git a/_targets.R b/_targets.R
@@ -1,11 +1,12 @@
+# Generated by pipedat: do not edit by hand
 # This file defines the pipeline for the ResearchCompendium project.
 library(targets)
 library(tarchetypes)
 library(pipedat) # To remove by the end of the project
 
-tar_option_set(packages = c('curl', 'googleCloudStorageR', 'aws.s3', 'yaml', 'dplyr'), format = 'file')
+tar_option_set(packages = c('curl', 'googleCloudStorageR', 'aws.s3', 'yaml', 'dplyr'), format = 'file') # To edit properly by the end of the project
 
-tar_source('workspace/scripts/')
+tar_source('workspace/scripts/') # To edit properly by the end of the project
 list(
   tar_target(bibtex_master, bibtex_master(), format = "file", cue = tar_cue(mode = "always")),
     list(list(tar_target(tg_835bc0d1_e57a_4e63_a327_908ee871bf2d_Scientific_article, 
@@ -448,35 +449,27 @@ list(
             })
         "workspace/data/harvested/viirs_nighttime_light-1.0.0/raw"
     }, format = "file"))),
-    list(tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_istop_data_preparation, 
+    list(tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_istop, 
     {
         ana_petroleum_pollution_incidents_istop(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
             input_files = list(tg_835bc0d1_e57a_4e63_a327_908ee871bf2d_istop))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/istop_prep.gpkg"
-    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_istop_diffusive_model, 
-    {
-        ana_petroleum_pollution_incidents_istop_diffusive(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
-            input_files = list(tg_a726889e_848e_4d6c_8496_a7a772e70d85_istop_data_preparation))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_istop.tif"
-    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_nasp_data_preparation, 
+        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_istop.gpkg"
+    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_nasp, 
     {
         ana_petroleum_pollution_incidents_nasp(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
             input_files = list(tg_e566fb8c_42d8_4013_8002_17af44a15a46_nasp))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/nasp_prep.gpkg"
-    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_nasp_diffusive_model, 
-    {
-        ana_petroleum_pollution_incidents_nasp_diffusive(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
-            input_files = list(tg_a726889e_848e_4d6c_8496_a7a772e70d85_nasp_data_preparation))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_nasp.tif"
-    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_neec_data_preparation, 
+        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_nasp.gpkg"
+    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_neec, 
     {
         ana_petroleum_pollution_incidents_neec(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
             input_files = list(tg_56c710c3_1859_4eab_821f_e1e41dbbfd29_neec))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/neec_prep.gpkg"
-    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_neec_diffusive_model, 
-    {
-        ana_petroleum_pollution_incidents_neec_diffusive(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
-            input_files = list(tg_a726889e_848e_4d6c_8496_a7a772e70d85_neec_data_preparation))
-        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_neec.tif"
+        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents_neec.gpkg"
+    }, format = "file"), tar_target(tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents, 
+    {
+        ana_petroleum_pollution_incidents(output_path = "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0", 
+            input_files = list(tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_istop, 
+                tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_nasp, 
+                tg_a726889e_848e_4d6c_8496_a7a772e70d85_petroleum_pollution_incidents_neec))
+        "workspace/data/analyzed/petroleum_pollution_incidents-1.0.0/petroleum_pollution_incidents.gpkg"
     }, format = "file"))
 )