fixed bug in altering bounds between iterations

Author: AnotherSamWilson

R/addIterations.R

@@ -74,7 +74,7 @@ addIterations <- function(
 
   # Set up for iterations
   FUN <- optObj$FUN
-  boundsDT <- boundsToDT(optObj$bounds)
+  boundsDT <- boundsToDT(bounds)
   scoreSummary <- optObj$scoreSummary
   Epoch <- max(scoreSummary$Epoch)
   `%op%` <- ParMethod(parallel)
@@ -141,6 +141,7 @@ addIterations <- function(
     tm <- system.time(
       LocalOptims <- getLocalOptimums(
           optObj
+        , bounds = bounds
         , parallel=parallel
         , verbose=verbose
       )

tests/testthat/test-bayesOpt1D.R

@@ -7,7 +7,7 @@ test_that(
     skip_on_cran()
 
     set.seed(1991)
-    sf <- function(x) 100 - x^2
+    sf <- function(x) 100 - x^2/5
     FUN <- function(x) {
       return(list(Score = sf(x)))
     }
@@ -32,18 +32,20 @@ test_that(
       , gsPoints = 10
     )
 
-    # Test adding iterations with higher iters.k
+    # Test adding iterations with higher iters.k and different bounds
+    newBounds <- list(x=c(-2,8))
     optObj <- addIterations(
         optObj
-      , iters.n = 4
+      , bounds = newBounds
+      , iters.n = 6
       , iters.k = 2
       , verbose = 0
       , gsPoints = 10
     )
 
     print(optObj)
 
-    expect_equal(nrow(optObj$scoreSummary) , 12)
+    expect_equal(nrow(optObj$scoreSummary) , 14)
 
   }
 

tests/testthat/test-bayesOpt2D.R

@@ -45,6 +45,23 @@ testthat::test_that(
       , gsPoints = 10
     )
 
-    expect_true(nrow(optObj$scoreSummary) == 10)
+
+    # Piggy back off of this test. Check new bounds.
+    newBounds <- list(
+      x = c(-5,20)
+      , y = c(-30,110)
+    )
+
+    optObj <- addIterations(
+      optObj
+      , bounds = newBounds
+      , iters.n = 2
+      , iters.k = 2
+      , verbose = 0
+      , gsPoints = 10
+    )
+
+    expect_true(nrow(optObj$scoreSummary) == 12)
+
   }
 )