thinning by 600 and iteration list final

inbo · Jan 8, 2024 · 59eee99 · 59eee99
1 parent 1a2f87e
commit 59eee99
Show file tree

Hide file tree

Showing 6 changed files with 1,353 additions and 104 deletions.
diff --git a/source/targets/mas_steekproef_zn_lm/_targets/meta/meta b/source/targets/mas_steekproef_zn_lm/_targets/meta/meta
diff --git a/source/targets/mas_steekproef_zn_lm/_targets_r/targets/hulpvariabelen.R b/source/targets/mas_steekproef_zn_lm/_targets_r/targets/hulpvariabelen.R
@@ -43,9 +43,10 @@ list(
   tar_target(
     name = steekproefkader_finaal,
     command = add_stratum_sbp(
-      punten_sf = do.call(rbind.data.frame, plus_openheid_landschap),
-      sbp = do.call(rbind.data.frame, sbp_akkervogels),
+      punten_sf = plus_openheid_landschap,
+      sbp = do.call(rbind.data.frame, sbp_akkervogels)
       ),
-    pattern = map(plus_openheid_landschap)
+    pattern = map(plus_openheid_landschap),
+    iteration = "list"
   )
 )
diff --git a/source/targets/mas_steekproef_zn_lm/_targets_r/targets/nabehandeling.R b/source/targets/mas_steekproef_zn_lm/_targets_r/targets/nabehandeling.R
@@ -1,23 +1,23 @@
 list(
-  tarchetypes::tar_map(
-    list(thin_dists = c(300, 600)),
-    tar_target(
-      steekproef_thinned,
-      thin_sample(
-        sample = steekproef,
-        thin_dist = thin_dists
-        ),
-      pattern = map(steekproef)
-    ),
-    tar_target(
-      steekproef_final,
-      replace_by_existing(
-        sample = steekproef_thinned,
-        existing_points = existing_data,
-        overlap_prop = 0.5,
-        sbp_file = sbp_akkervogels
-        ),
-      pattern = map(steekproef_thinned)
-    )
+  tar_target(
+    steekproef_thinned,
+    thin_sample(
+      sample = steekproef,
+      thin_dist = 600
+      ),
+    pattern = map(steekproef),
+    iteration = "list"
+  ),
+  tar_target(
+    steekproef_final,
+    replace_by_existing(
+      sample = steekproef_thinned,
+      existing_points = existing_data,
+      overlap_prop = 0.5,
+      sbp_file = do.call(rbind.data.frame, sbp_akkervogels)
+      ),
+    pattern = map(steekproef_thinned),
+    iteration = "list"
   )
 )
+
diff --git a/source/targets/mas_steekproef_zn_lm/_targets_r/targets/steekproeftrekking.R b/source/targets/mas_steekproef_zn_lm/_targets_r/targets/steekproeftrekking.R
@@ -26,7 +26,7 @@ list(
   ),
   tarchetypes::tar_group_by(
     steekproefkader_per_stratum,
-    steekproefkader_finaal %>%
+    do.call(rbind.data.frame, steekproefkader_finaal) %>%
       semi_join(allocatie_df %>%
                   select(Naam, is_sbp, openheid_klasse),
                 by = c("Naam", "is_sbp", "openheid_klasse")),
@@ -41,6 +41,7 @@ list(
       sample_size_multiplication = 1,
       balance = c("X", "Y", "area_prop_sb")
       ),
-    pattern = map(steekproefkader_per_stratum, allocatie_per_stratum)
+    pattern = map(steekproefkader_per_stratum, allocatie_per_stratum),
+    iteration = "list"
   )
 )
diff --git a/source/targets/mas_steekproef_zn_lm/_targets_r/targets/version-control.R b/source/targets/mas_steekproef_zn_lm/_targets_r/targets/version-control.R
@@ -4,7 +4,7 @@ list(
     output_finaal(
       files = list(steekproefkader = steekproefkader_finaal, 
                    steekproef = steekproef_final_600),
-      write_out = TRUE
+      write_out = FALSE
     )
   )
 )
diff --git a/source/targets/mas_steekproef_zn_lm/targets_steekproef_zn_lm.Rmd b/source/targets/mas_steekproef_zn_lm/targets_steekproef_zn_lm.Rmd
@@ -356,9 +356,10 @@ list(
     name = steekproefkader_finaal,
     command = add_stratum_sbp(
       punten_sf = plus_openheid_landschap,
-      sbp = sbp_akkervogels
+      sbp = do.call(rbind.data.frame, sbp_akkervogels)
       ),
-    pattern = map(plus_openheid_landschap)
+    pattern = map(plus_openheid_landschap),
+    iteration = "list"
   )
 )
 ```
@@ -392,7 +393,7 @@ list(
   ),
   tarchetypes::tar_group_by(
     steekproefkader_per_stratum,
-    steekproefkader_finaal %>%
+    do.call(rbind.data.frame, steekproefkader_finaal) %>%
       semi_join(allocatie_df %>%
                   select(Naam, is_sbp, openheid_klasse),
                 by = c("Naam", "is_sbp", "openheid_klasse")),
@@ -407,35 +408,36 @@ list(
       sample_size_multiplication = 1,
       balance = c("X", "Y", "area_prop_sb")
       ),
-    pattern = map(steekproefkader_per_stratum, allocatie_per_stratum)
+    pattern = map(steekproefkader_per_stratum, allocatie_per_stratum),
+    iteration = "list"
   )
 )
 ```
 
 ```{targets nabehandeling}
 list(
-  tarchetypes::tar_map(
-    list(thin_dists = c(300, 600)),
-    tar_target(
-      steekproef_thinned,
-      thin_sample(
-        sample = steekproef,
-        thin_dist = thin_dists
-        ),
-      pattern = map(steekproef)
-    ),
-    tar_target(
-      steekproef_final,
-      replace_by_existing(
-        sample = steekproef_thinned,
-        existing_points = existing_data,
-        overlap_prop = 0.5,
-        sbp_file = sbp_akkervogels
-        ),
-      pattern = map(steekproef_thinned)
-    )
+  tar_target(
+    steekproef_thinned,
+    thin_sample(
+      sample = steekproef,
+      thin_dist = 600
+      ),
+    pattern = map(steekproef),
+    iteration = "list"
+  ),
+  tar_target(
+    steekproef_final,
+    replace_by_existing(
+      sample = steekproef_thinned,
+      existing_points = existing_data,
+      overlap_prop = 0.5,
+      sbp_file = do.call(rbind.data.frame, sbp_akkervogels)
+      ),
+    pattern = map(steekproef_thinned),
+    iteration = "list"
   )
 )
+
 ```
 
 ```{targets version-control}
@@ -445,7 +447,7 @@ list(
     output_finaal(
       files = list(steekproefkader = steekproefkader_finaal, 
                    steekproef = steekproef_final_600),
-      write_out = TRUE
+      write_out = FALSE
     )
   )
 )