multipoint -> multi-point

Author: jakob-r

DESCRIPTION

@@ -6,7 +6,7 @@ Description: Flexible and comprehensive R toolbox for model-based optimization
     conditional parameters. The machine learning toolbox 'mlr' provide dozens
     of regression learners to model the performance of the target algorithm with
     respect to the parameter settings. It provides many different infill criteria
-    to guide the search process. Additional features include multipoint batch
+    to guide the search process. Additional features include multi-point batch
     proposal, parallel execution as well as visualization and sophisticated
     logging mechanisms, which is especially useful for teaching and understanding
     of algorithm behavior. 'mlrMBO' is implemented in a modular fashion, such that

LICENSE

@@ -1,25 +1,2 @@
-BSD 2-Clause License
-
-Copyright (c) 2017, Bernd Bischl
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+YEAR: 2018
+COPYRIGHT HOLDER: Bernd Bischl

R/SMBO.R

@@ -60,7 +60,7 @@ updateSMBO = function(opt.state, x, y) {
 
   assertDataFrame(x)
   if (nrow(x) > 1 && !is.list(y)) {
-    stopf("For a multipoint update y has to be a list.")
+    stopf("For a multi-point update y has to be a list.")
   }
   if (!is.list(y)) {
     y = list(y)

R/checkStuff.R

@@ -112,9 +112,9 @@ checkStuff = function(fun, design, learner, control) {
             "\nBut this learner does not support prediction of standard errors!"))
       }
       if (control$multipoint.method == "cl" && infill.crit.id != "ei")
-        stopf("Multipoint proposal using constant liar needs the infill criterion 'ei' (expected improvement), but you used '%s'!", infill.crit.id)
+        stopf("Multi-point proposal using constant liar needs the infill criterion 'ei' (expected improvement), but you used '%s'!", infill.crit.id)
       if (control$multipoint.method == "cb" && infill.crit.id != "cb")
-        stopf("Multipoint proposal using parallel cb needs the infill criterion 'cb' (confidence bound), but you used '%s'!", infill.crit.id)
+        stopf("Multi-point proposal using parallel cb needs the infill criterion 'cb' (confidence bound), but you used '%s'!", infill.crit.id)
     }
   }
 

R/doc_error_handling.R

@@ -12,7 +12,7 @@
 #'   \item{4}{The target function crashes the whole R process.}
 #'   \item{5}{The surrogate machine learning model might crash.
 #'     Kriging quite often can run into numerical problems.}
-#'   \item{6}{The proposal mechanism - in multipoint or single point mode - produces
+#'   \item{6}{The proposal mechanism - in multi-point or single point mode - produces
 #'     a point which is either close to another candidate point in the same iteration or
 #'     an already visited point in a previous iteration.}
 #'   \item{7}{The mbo process exits / stops / crashes itself. Maybe because it hit a walltime.}

R/doc_mbo_OptPath.R

@@ -17,7 +17,7 @@
 #'   \item{final\_eval}{If \code{final.evals} is set in \code{\link{makeMBOControl}}: Final evaluations of the proposed solution to reduce noise in y.}
 #'   }
 #' }
-#' \item{parego.weight}{Weight vector sampled for multipoint ParEGO}
+#' \item{parego.weight}{Weight vector sampled for multi-point ParEGO}
 #' \item{...}{Depending on the chosen infill criterion there will be additional columns, e.g. \code{se} and \code{mean} for the Expected Improvement)}
 #' }
 #'

R/doc_mbo_parallel.R

@@ -16,7 +16,7 @@
 #' }
 #' Details regarding the latter:
 #' \describe{
-#' \item{single-objective MBO with LCB multipoint}{Parallel optimization of LCBs for the lambda-values.}
+#' \item{single-objective MBO with LCB multi-point}{Parallel optimization of LCBs for the lambda-values.}
 #' \item{Multi-objective MBO with ParEGO}{Parallel optimization of scalarization functions.}
 #' }
 #'

R/getExtras.R

@@ -28,7 +28,7 @@ getExtras = function(n, prop, train.time, control) {
     # pregenerate a dummmy "prop" data structure
     prop = list(crit.vals = matrix(NA_real_, nrow = n, ncol = k), propose.time = NA_real_, errors.model = NA_character_, prop.type = rep("initdesign", n))
     # a) no infill crit components for MCO
-    # b) infill crit is ignored for multipoint moimbo, in which case we don't use any components
+    # b) infill crit is ignored for multi-point moimbo, in which case we don't use any components
     if (allow.crit.components) {
       prop$crit.components = getMBOInfillCritDummyComponents(infill.crit)
     }

R/getSupportedMultipointInfillOptFunctions.R

@@ -1,7 +1,7 @@
-#' @title Get names of supported multipoint infill-criteria optimizers.
+#' @title Get names of supported multi-point infill-criteria optimizers.
 #'
 #' @description
-#' Returns all names of supported multipoint infill-criteria optimizers.
+#' Returns all names of supported multi-point infill-criteria optimizers.
 #'
 #' @return [\code{character}]
 #' @export

R/makeMBOControl.R

@@ -80,7 +80,7 @@
 #'   \dQuote{warn}: The error will be converted to a waring and a random point will be proposed.
 #'   \dQuote{quiet}: Same as “warn” but without the warning.
 #'   Default is: \dQuote{stop}.
-#'   
+#'
 #' @return [\code{\link{MBOControl}}].
 #' @aliases MBOControl
 #' @family MBOControl
@@ -190,7 +190,7 @@ print.MBOControl = function(x, ...) {
       catf("Infill optimizer              : %s", x$infill.opt)
       catf("Infill optimizer restarts     : %i", x$infill.opt.restarts)
     } else {
-      catf("Multipoint method             : %s", x$multipoint.method)
+      catf("Multi-point method            : %s", x$multipoint.method)
     }
     catf("Final point by                : %s", x$final.method)
   }