equipement->equipment and retrival->retrieval

GeoPressure/GeoPressureR#45

Author: Rafnuss

analysis/4-basic-graph.R

@@ -42,9 +42,9 @@ g <- graph_from_data_frame(data.frame(
   weight = -log(grl$p)
 ))
 
-retrival <- which.max(as.matrix(static_prob_marginal[[length(static_prob_marginal)]])) + grl$sz[1] * grl$sz[2] * (grl$sz[3] - 1)
-stopifnot(retrival %in% grl$retrival)
-sp <- shortest_paths(g, from = paste(grl$equipement), to = paste(retrival))
+retrieval <- which.max(as.matrix(static_prob_marginal[[length(static_prob_marginal)]])) + grl$sz[1] * grl$sz[2] * (grl$sz[3] - 1)
+stopifnot(retrieval %in% grl$retrieval)
+sp <- shortest_paths(g, from = paste(grl$equipment), to = paste(retrieval))
 
 # Convert igraph representation to lat-lon
 shortest_path <- graph_path2lonlat(as.numeric(sp$vpath[[1]]$name), grl)

analysis/5-3-wind-graph_analyse.R

@@ -40,9 +40,9 @@ g <- graph_from_data_frame(data.frame(
   weight = -log(grl$p)
 ))
 
-retrival <- which.max(as.matrix(static_prob_marginal[[length(static_prob_marginal)]])) + grl$sz[1] * grl$sz[2] * (grl$sz[3] - 1)
-stopifnot(retrival %in% grl$retrival)
-sp <- shortest_paths(g, from = paste(grl$equipement), to = paste(retrival))
+retrieval <- which.max(as.matrix(static_prob_marginal[[length(static_prob_marginal)]])) + grl$sz[1] * grl$sz[2] * (grl$sz[3] - 1)
+stopifnot(retrieval %in% grl$retrieval)
+sp <- shortest_paths(g, from = paste(grl$equipment), to = paste(retrieval))
 
 # Convert igraph representation to lat-lon
 shortest_path <- graph_path2lonlat(as.numeric(sp$vpath[[1]]$name), grl)

reports/make_reports.R

@@ -35,7 +35,7 @@ for (report in report_list) {
   str <- paste0(str, '- text: "', report, '"\n  menu:\n')
   for (gdl in gdl_list) {
     str <- paste0(str, '   - text: "', gdl, '"\n')
-    str <- paste0(str, '     href: "/GeoPressureTemplate/', report, "/", gdl, '.html\n"')
+    str <- paste0(str, '     href: "/GeoPressureTemplate/', report, '/', gdl, '.html"\n')
   }
 }
 writeLines(str)