Improve progress printing

Author: mhesselbarth

NEWS.md

@@ -1,7 +1,8 @@
 # shar 1.1
 * Improvements
   * Use energy_df to get energy for printing if available
-  + Updated tests
+  * Updated tests
+  * More stable progress printing
 
 # shar 1.0.1
 * Improvements

R/print.rd_mar.R

@@ -73,7 +73,7 @@ print.rd_mar <- function(x,
 
     mean_energy <- round(mean(vapply(x$energy_df, function(x) {
 
-      tail(x, n = 1)[, 2]
+      utils::tail(x, n = 1)[, 2]
     }, FUN.VALUE = numeric(1))), digits = digits)
   }
 

R/print.rd_pat.R

@@ -77,7 +77,7 @@ print.rd_pat <- function(x,
 
     mean_energy <- round(mean(vapply(x$energy_df, function(x) {
 
-      tail(x, n = 1)[, 2]
+      utils::tail(x, n = 1)[, 2]
     }, FUN.VALUE = numeric(1))), digits = digits)
   }
 

R/reconstruct_pattern_cluster.R

@@ -308,7 +308,7 @@ reconstruct_pattern_cluster <- function(pattern,
         if (plot) {
 
           # https://support.rstudio.com/hc/en-us/community/posts/200661917-Graph-does-not-update-until-loop-completion
-          Sys.sleep(0.1)
+          Sys.sleep(0.01)
 
           graphics::plot(x = pcf_observed[[1]], y = pcf_observed[[3]],
                          type = "l", col = "black",
@@ -337,8 +337,12 @@ reconstruct_pattern_cluster <- function(pattern,
       # print progress
       if (verbose) {
 
+        if (!plot) {
+          Sys.sleep(0.01)
+        }
+
         message("\r> Progress: n_random: ", current_pattern, "/", n_random,
-                " || max_runs: ", i, "/", max_runs,
+                " || max_runs: ", floor(i / max_runs * 100), "%",
                 " || energy = ", round(energy_current, 5), "\t\t",
                 appendLF = FALSE)
       }

R/reconstruct_pattern_hetero.R

@@ -280,7 +280,7 @@ reconstruct_pattern_hetero <- function(pattern,
         if (plot) {
 
           # https://support.rstudio.com/hc/en-us/community/posts/200661917-Graph-does-not-update-until-loop-completion
-          Sys.sleep(0.1)
+          Sys.sleep(0.01)
 
           graphics::plot(x = pcf_observed[[1]], y = pcf_observed[[3]],
                          type = "l", col = "black",
@@ -309,8 +309,12 @@ reconstruct_pattern_hetero <- function(pattern,
       # print progress
       if (verbose) {
 
+        if (!plot) {
+          Sys.sleep(0.01)
+        }
+
         message("\r> Progress: n_random: ", current_pattern, "/", n_random,
-                " || max_runs: ", i, "/", max_runs,
+                " || max_runs: ", floor(i / max_runs * 100), "%",
                 " || energy = ", round(energy_current, 5), "\t\t",
                 appendLF = FALSE)
       }

R/reconstruct_pattern_homo.R

@@ -274,13 +274,14 @@ reconstruct_pattern_homo <- function(pattern,
         if (plot) {
 
           # https://support.rstudio.com/hc/en-us/community/posts/200661917-Graph-does-not-update-until-loop-completion
-          Sys.sleep(0.1)
+          Sys.sleep(0.01)
 
           graphics::plot(x = pcf_observed[[1]], y = pcf_observed[[3]],
                          type = "l", col = "black",
                          xlab = "r", ylab = "g(r)")
 
-          graphics::lines(x = pcf_relocated[[1]], y = pcf_relocated[[3]], col = "red")
+          graphics::lines(x = pcf_relocated[[1]], y = pcf_relocated[[3]],
+                          col = "red")
 
           graphics::legend("topright",
                            legend = c("observed", "reconstructed"),
@@ -303,8 +304,12 @@ reconstruct_pattern_homo <- function(pattern,
       # print progress
       if (verbose) {
 
+        if (!plot) {
+          Sys.sleep(0.01)
+        }
+
         message("\r> Progress: n_random: ", current_pattern, "/", n_random,
-                " || max_runs: ", i, "/", max_runs,
+                " || max_runs: ", floor(i / max_runs * 100), "%",
                 " || energy = ", round(energy_current, 5), "\t\t",
                 appendLF = FALSE)
       }

R/reconstruct_pattern_marks.R

@@ -207,7 +207,7 @@ reconstruct_pattern_marks <- function(pattern,
         if (plot) {
 
           # https://support.rstudio.com/hc/en-us/community/posts/200661917-Graph-does-not-update-until-loop-completion
-          Sys.sleep(0.1)
+          Sys.sleep(0.01)
 
           graphics::plot(x = kmmr_observed[[1]], y = kmmr_observed[[3]],
                          type = "l", col = "black",
@@ -235,8 +235,13 @@ reconstruct_pattern_marks <- function(pattern,
 
       # print progress
       if (verbose) {
+
+        if (!plot) {
+          Sys.sleep(0.01)
+        }
+
         message("\r> Progress: n_random: ", current_pattern, "/", n_random,
-                " || max_runs: ", i, "/", max_runs,
+                " || max_runs: ", floor(i / max_runs * 100), "%",
                 " || energy = ", round(energy_current, 5), "\t\t",
                 appendLF = FALSE)
       }