no need for row number printing when only one condition supplied

philchalmers · Oct 23, 2024 · 67c513d · 67c513d
1 parent a52c720
commit 67c513d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: SimDesign
 Title: Structure for Organizing Monte Carlo Simulation Designs
-Version: 2.17.1
+Version: 2.17.2
 Authors@R: c(person("Phil", "Chalmers", email = "rphilip.chalmers@gmail.com", role = c("aut", "cre"),
                     comment = c(ORCID="0000-0001-5332-2810")),
              person("Matthew", "Sigal", role = c("ctb")),

diff --git a/R/SimSolve.R b/R/SimSolve.R
@@ -625,11 +625,11 @@ SimSolve <- function(design, interval, b, generate, analyse, summarise,
                    ' using integer=TRUE search'), call.=FALSE)
     }
     for(i in start:nrow(design)){
-        if(verbose){
-            cat(sprintf('\n\n#############\nDesign row %s:\n\n', i))
+        if(verbose && nrow(design) > 1L){
+            cat(sprintf('\n#############\nDesign row %s:\n\n', i))
             print(cbind(as.data.frame(design[i,]), b = b))
-            cat("\n")
         }
+        if(verbose) cat("\n")
 
         .SIMDENV$stored_results <- vector('list', maxiter)
         .SIMDENV$stored_medhistory <- rep(NA, maxiter)

diff --git a/R/util.R b/R/util.R
@@ -87,9 +87,13 @@ print_progress <- function(row, trow, stored_time, RAM, progress,
             condstring <- paste0(nms, '=', nms2, collapse=', ')
         }
     }
-    if(RAM != "") RAM <- sprintf(';   RAM Used: %s', RAM)
-    cat(sprintf('\rDesign: %i/%i%s;   Replications: %i;   Total Time: %s ',
-                row, trow, RAM, replications, timeFormater_internal(sum(stored_time))))
+    if(RAM != "") RAM <- sprintf(';   RAM Used: %s;', RAM)
+    if(row == 1 && trow == 1)
+        cat(sprintf('\rReplications: %i%s   Total Time: %s ',
+                    replications, RAM, timeFormater_internal(sum(stored_time))))
+    else
+        cat(sprintf('\rDesign: %i/%i;   Replications: %i%s   Total Time: %s ',
+                    row, trow, replications, RAM, timeFormater_internal(sum(stored_time))))
     cat(sprintf('\n Conditions: %s\n', condstring))
     if(progress) cat('\r')
     invisible(NULL)