374 use tar map to reduce duplicated code

.gitignore

@@ -46,3 +46,4 @@ npt_net_qgis
 scottraffic/
 *.geojson
 osm_os/
+nptscot.github.io/

_targets.R

@@ -25,13 +25,15 @@ pkgs = get_pkgs()
 
 
 tar_option_set(
-  controller = crew::crew_controller_local(workers = 1),
+  controller = crew::crew_controller_local(workers = 4),
   memory = "transient",
   garbage_collection = TRUE,
   storage = "worker",
   retrieval = "worker",
   packages = pkgs,
-  format = "rds" # default storage format
+  format = "rds", # default storage format
+  # See https://books.ropensci.org/targets/performance.html#memory:
+  garbage_collection = 1 # collect garbage after each target
 )
 
 # Targets -----------------------------------------------------------------
@@ -214,184 +216,93 @@ list(
   }),
 
   # School routing ----------------------------------------------------------
-
-  tar_target(rs_school_fastest, {
-    rs = get_routes(
-      od = od_school |> slice_max(n = parameters$max_to_route, order_by = all, with_ties = FALSE),
-      plans = "fastest",
-      purpose = "school",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_school_fastest, {
-    length(rs_school_fastest) # Hack for scheduling
-  }),
-  tar_target(rs_school_quietest, {
-    length(done_school_fastest)
-    rs = get_routes(
-      od = od_school |> slice_max(n = parameters$max_to_route, order_by = all, with_ties = FALSE),
-      plans = "quietest",
-      purpose = "school",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_school_quietest, {
-    length(rs_school_quietest) # Hack for scheduling
-  }),
-
-  # Balanced:
-  tar_target(rs_school_balanced, {
-    length(done_school_quietest)
-    rs = get_routes(
-      od = od_school |> slice_max(n = parameters$max_to_route, order_by = all, with_ties = FALSE),
-      plans = "balanced",
-      purpose = "school",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_school_balanced, {
-    length(rs_school_balanced) # Hack for scheduling
-  }),
-  tar_target(rs_school_ebike, {
-    length(done_school_quietest)
-    rs = get_routes(
-      od = od_school |> slice_max(n = parameters$max_to_route, order_by = all, with_ties = FALSE),
-      plans = "ebike",
-      purpose = "school",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_school_ebike, {
-    length(rs_school_ebike) # Hack for scheduling
-  }),
+  tar_target(plans, {
+    parameters$plans
+  }),
+
+tar_target(rs_school, {
+  get_routes(
+    od = od_school |> slice_max(n = parameters$max_to_route, order_by = all, with_ties = FALSE),
+                  plans = plans,
+                  purpose = "school",
+                  folder = region_folder,
+                  date = parameters$date_routing,
+                  segments = "both")
+  },
+  pattern = map(plans),
+  iteration = "list"
+  )
+
+  ,
 
   # Commute routing ---------------------------------------------------------
 
-  tar_target(rs_commute_fastest, {
-    length(done_school_ebike) # Do school routing first
-    rs = get_routes(
+  tar_target(rs_commute, {
+    get_routes(
       od = od_commute_subset,
-      plans = "fastest",
-      purpose = "commute",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_commute_fastest, {
-    length(rs_commute_fastest) # Hack for scheduling
-  }),
-  tar_target(rs_commute_balanced, {
-    length(done_commute_fastest)
-    rs = get_routes(
-      od = od_commute_subset,
-      plans = "balanced",
-      purpose = "commute",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_commute_balanced, {
-    length(rs_commute_balanced) # Hack for scheduling
-  }),
-  tar_target(rs_commute_quietest, {
-    length(done_commute_fastest)
-    rs = get_routes(
-      od = od_commute_subset,
-      plans = "quietest",
+      plans = plans,
       purpose = "commute",
       folder = region_folder,
       date = parameters$date_routing,
       segments = "both"
     )
-    rs
-  }),
-  tar_target(done_commute_quietest, {
-    length(rs_commute_quietest) # Hack for scheduling
-  }),
-  tar_target(rs_commute_ebike, {
-    length(done_commute_quietest)
-    rs = get_routes(
-      od = od_commute_subset,
-      plans = "ebike",
-      purpose = "commute",
-      folder = region_folder,
-      date = parameters$date_routing,
-      segments = "both"
-    )
-    rs
-  }),
-  tar_target(done_commute_ebike, {
-    length(rs_commute_ebike) # Hack for scheduling
-  }),
+  },
+  pattern = map(plans),
+  iteration = "list"
+  ),
 
   # Commute routing post-processing -----------------------------------------
 
   tar_target(r_commute_fastest, {
-    rs_commute_fastest[[1]]$routes
+    rs_commute[[1]][[1]]$routes
   }),
   tar_target(r_commute_quietest, {
-    rs_commute_quietest[[1]]$routes
+    rs_commute[[3]][[1]]$routes
   }),
   tar_target(r_commute_ebike, {
-    rs_commute_ebike[[1]]$routes
+    rs_commute[[4]][[1]]$routes
   }),
   tar_target(r_commute_balanced, {
-    rs_commute_balanced[[1]]$routes
+    rs_commute[[2]][[1]]$routes
   }),
   tar_target(rnet_gq_commute_fastest, {
-    segments2rnet(rs_commute_fastest[[1]]$segments)
+    segments2rnet(rs_commute[[1]][[1]]$segments)
   }),
   tar_target(rnet_gq_commute_quietest, {
-    segments2rnet(rs_commute_quietest[[1]]$segments)
+    segments2rnet(rs_commute[[3]][[1]]$segments)
   }),
   tar_target(rnet_gq_commute_ebike, {
-    segments2rnet(rs_commute_ebike[[1]]$segments)
+    segments2rnet(rs_commute[[4]][[1]]$segments)
   }),
   tar_target(rnet_gq_commute_balanced, {
-    segments2rnet(rs_commute_balanced[[1]]$segments)
+    segments2rnet(rs_commute[[2]][[1]]$segments)
   }),
 
   # School routing post-processing -----------------------------------------
 
   tar_target(r_school_fastest, {
-    rs_school_fastest[[1]]$routes
+    rs_school[[1]][[1]]$routes
   }),
   tar_target(r_school_quietest, {
-    rs_school_quietest[[1]]$routes
+    rs_school[[3]][[1]]$routes
   }),
   tar_target(r_school_ebike, {
-    rs_school_ebike[[1]]$routes
+    rs_school[[4]][[1]]$routes
   }),
   tar_target(r_school_balanced, {
-    rs_school_balanced[[1]]$routes
+    rs_school[[2]][[1]]$routes
   }),
   tar_target(rnet_gq_school_fastest, {
-    segments2rnet(rs_school_fastest[[1]]$segments)
+    segments2rnet(rs_school[[1]][[1]]$segments)
   }),
   tar_target(rnet_gq_school_quietest, {
-    segments2rnet(rs_school_quietest[[1]]$segments)
+    segments2rnet(rs_school[[3]][[1]]$segments)
   }),
   tar_target(rnet_gq_school_ebike, {
-    segments2rnet(rs_school_ebike[[1]]$segments)
+    segments2rnet(rs_school[[4]][[1]]$segments)
   }),
   tar_target(rnet_gq_school_balanced, {
-    segments2rnet(rs_school_balanced[[1]]$segments)
+    segments2rnet(rs_school[[2]][[1]]$segments)
   }),
 
   # Commute Uptake ----------------------------------------------------------