Fixed asp_list error

Author: wburke24

R/RHESSysPreprocess.R

@@ -127,7 +127,7 @@ RHESSysPreprocess = function(template,
                             asprules = asprules)
 
   readin = world_gen_out[[1]]
-  asp_list = world_gen_out[[2]]
+  asp_rules = world_gen_out[[2]]
 
   # ---------- Run CreateFlownet ----------
   cat("Begin CreateFlownet.R")
@@ -145,7 +145,7 @@ RHESSysPreprocess = function(template,
                 readin = readin,
                 type = type,
                 typepars = typepars,
-                asp_list = asp_list,
+                asp_rules = asp_rules,
                 streams = streams,
                 overwrite = overwrite,
                 roads = roads,

R/world_gen.R

@@ -154,6 +154,11 @@ world_gen = function(template,
   } # end loop through n_basestations
 
   # -------------------- Process Template + Maps --------------------
+  # mode for aggregating by mode
+  mode_fun = function(x) {
+    ux <- unique(x)
+    ux[which.max(tabulate(match(x, ux)))]
+  }
   # Build list based on operations called for by template
   statevars = vector("list",length(template_clean))
 
@@ -206,14 +211,7 @@ world_gen = function(template,
         statevars[[i]][[s]] = aggregate(maptmp, by = level_agg, FUN = "mean")
       } else if (template_clean[[i]][2] == "mode") { #mode
         maptmp = as.vector(t(map_df[template_clean[[i]][2 + s - s2]]))
-        statevars[[i]][[s]] = aggregate(
-          maptmp,
-          by = level_agg,
-          FUN = function(x) {
-            ux <- unique(x)
-            ux[which.max(tabulate(match(x, ux)))]
-          }
-        )
+        statevars[[i]][[s]] = aggregate( maptmp, by = level_agg, FUN = mode_fun)
       } else if (template_clean[[i]][2] == "eqn") { # only for horizons old version -- use normal mean in future
         maptmp = as.vector(t(map_df[template_clean[[i]][5]]))
         statevars[[i]][[s]] = aggregate(maptmp, by = level_agg, FUN = "mean")