From 5a5802beee536893cbbab7e15a9fe9019931cab6 Mon Sep 17 00:00:00 2001 From: Jakob Richter Date: Wed, 22 Feb 2017 10:01:04 +0100 Subject: [PATCH 1/2] improve doc --- R/proposePointsDIB.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/proposePointsDIB.R b/R/proposePointsDIB.R index d0d8a96be..3d7f271e4 100644 --- a/R/proposePointsDIB.R +++ b/R/proposePointsDIB.R @@ -3,8 +3,8 @@ # # 1-point proposal: we take the user-defined cb-lambda from the control, then simply optimize # -# n-point proposal: we sample n random cb-lambdas, then propose a point normally, -# then add it to the design (fake add) with the its cb-vector as fake output. then iterate. +# n-point proposal: Each point is proposed using the user-defined cb-lambda. +# Proposals are feed back to the surrogate following the surrogate "believer" approach. proposePointsDIB = function(opt.state) { @@ -22,7 +22,7 @@ proposePointsDIB = function(opt.state) { control2 = control control2$propose.points == 1L # Create CB crit fun - cbFun = makeMBOInfillCritCB(cb.lambda = control2$infill.crit$params$cb.lambda)$fun + cbFun = control2$infill.crit$fun props = list() # copy opt.path so we can store already proposed points in it opt.path2 = deepCopyOptPath(opt.path) From 14a06d4a364efc4079c5e8e91c0f1e54b58a8e8c Mon Sep 17 00:00:00 2001 From: Jakob Richter Date: Wed, 22 Feb 2017 10:06:09 +0100 Subject: [PATCH 2/2] take change back --- R/proposePointsDIB.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/proposePointsDIB.R b/R/proposePointsDIB.R index 3d7f271e4..15dd65c92 100644 --- a/R/proposePointsDIB.R +++ b/R/proposePointsDIB.R @@ -22,7 +22,7 @@ proposePointsDIB = function(opt.state) { control2 = control control2$propose.points == 1L # Create CB crit fun - cbFun = control2$infill.crit$fun + cbFun = makeMBOInfillCritCB(cb.lambda = control2$infill.crit$params$cb.lambda)$fun props = list() # copy opt.path so we can store already proposed points in it opt.path2 = deepCopyOptPath(opt.path)