More robust loops

Do not use 1:length()
NREL · Jan 29, 2015 · ca30d1d · ca30d1d
1 parent a4c9a98
commit ca30d1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/R/plexos_open.R b/R/plexos_open.R
@@ -90,17 +90,15 @@ plexos_open <- function(folders = ".", names = folders) {
             "Rerun process_folder() to avoid problems.",
             call. = FALSE)
   } else {
-    # Compare
-    comp <- integer(length(conf$rplexos))
-    for (i in 1:length(conf$rplexos))
-      comp[i] <- compareVersion(this.vers, conf$rplexos[i])
+    # Compare to installed version
+    comp <- sapply(conf$rplexos, compareVersion, this.vers)
 
-    if (any(comp == -1)) {
+    if (any(comp > 0)) {
       warning("File(s) processed with a newer version of rplexos. ",
               "Update rplexos or rerun process_folder() to avoid problems.",
               call. = FALSE)
-    } else if (any(comp == 1)) {
-      warning("File(s) processed with an old version of rplexos. ",
+    } else if (any(comp < 0)) {
+      warning("File(s) processed with an older version of rplexos. ",
               "Rerun process_folder() to avoid problems.",
               call. = FALSE)
     }

diff --git a/R/process_solution.R b/R/process_solution.R
@@ -590,7 +590,7 @@ add_extra_tables <- function(db) {
     dbGetQuery(db$con, sql)
 
     # Fix time stamps in t_period_X (summary data)
-    for (i in 1:length(column.times)) {
+    for (i in seq_along(column.times)) {
       sql <- sprintf("INSERT INTO temp_period_%s
                       SELECT %s, %s, min(interval_id), min(correct_time) time
                       FROM temp_phase_%s