Final (?) cleanup.

R/powerCurve.R

@@ -52,6 +52,7 @@ powerCurve <- function(
     ) {
 
     opts <- simrOptions(...)
+    on.exit(simrOptions(opts))
 
     # START TIMING
     timing <- system.time({
@@ -102,7 +103,10 @@ powerCurve <- function(
 
     ss_list <- llply(breaks, function(z) x %in% head(targets, z))
 
-    msg <- str_c("Calculating power at ", length(ss_list), " sample sizes for ", along)
+    msg <- if(along==".simr_repl") {
+        str_c("Calculating power at ", length(ss_list), " sample sizes within ", within)
+    } else str_c("Calculating power at ", length(ss_list), " sample sizes along ", along)
+
     if(getSimrOption("progress")) message(msg)
 
     simulations <- maybe_llply(seq_len(nsim), function(.) doSim(sim), .text="Simulating")
@@ -142,8 +146,6 @@ powerCurve <- function(
 
     .simrLastResult $ lastResult <- rval
 
-    simrOptions(opts)
-
     return(rval)
 }
 

R/powerSim.R

@@ -38,6 +38,7 @@ powerSim <- function(
     ) {
 
     opts <- simrOptions(...)
+    on.exit(simrOptions(opts))
 
     nsim <- getSimrOption("nsim")
     alpha <- getSimrOption("alpha")
@@ -88,8 +89,6 @@ powerSim <- function(
     # END TIMING
     timing <- proc.time() - start
 
-    simrOptions(opts)
-
     # structure the return value
     rval <- list()
 

drafts/paper.Rmd

@@ -11,7 +11,7 @@ set.seed(123)
 ```
 
 ```{r options, echo=FALSE, message=FALSE}
-simrOptions(nsim=50, progress=FALSE)
+simrOptions(nsim=1000, progress=FALSE)
 ```
 
 ```{r knitr, echo=FALSE}
@@ -108,12 +108,20 @@ pc3 <- powerCurve(model3, along="g")
 plot(pc3)
 ```
 
+```{r}
+print(pc3)
+```
+
 ### Part 2
 
 Power curve with larger groups.
 
 ```{r powercurve4, cache=TRUE, autodep=TRUE}
-model4 <- extend(model1, within="x+g")
-pc4 <- powerCurve(model4, within="x+g")
+model4 <- extend(model1, within="x+g", n=5)
+pc4 <- powerCurve(model4, within="x+g", breaks=1:5)
 plot(pc4)
+```
+
+```{r}
+print(pc4)
 ```