From 67c890734190284dd1aa05ad491795773cc78062 Mon Sep 17 00:00:00 2001 From: Pierre Roudier Date: Mon, 10 May 2021 11:47:18 +1200 Subject: [PATCH] removed scales dependency --- DESCRIPTION | 3 +-- man/cLHS_result.Rd | 2 +- man/clhs-package.Rd | 4 ++-- man/clhs.Rd | 16 ++++++++-------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cac4320..a534bd0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,8 +23,7 @@ Imports: utils, sf, raster, reshape2, - plyr, - scales, + plyr, cluster License: GPL (>= 2) Encoding: UTF-8 diff --git a/man/cLHS_result.Rd b/man/cLHS_result.Rd index 3dc81bb..700102e 100644 --- a/man/cLHS_result.Rd +++ b/man/cLHS_result.Rd @@ -8,7 +8,7 @@ An object of class \code{cLHS_result} contains the following slots: \item{index_samples }{a vector giving the indices of the chosen samples.} \item{sampled_data }{the sampled data.frame.} \item{obj}{a vector giving the -evolution of the objective function throughout the Meropolis-Hastings +evolution of the objective function throughout the Metropolis-Hastings iterations.} \item{cost}{a vector giving the evolution of the cost function throughout the Meropolis-Hastings iterations, if available, otherwise NULL.} } diff --git a/man/clhs-package.Rd b/man/clhs-package.Rd index 82486bf..670bf61 100644 --- a/man/clhs-package.Rd +++ b/man/clhs-package.Rd @@ -31,8 +31,8 @@ Soil Sensing, Progress in Soil Science, pages 111-119. * For the cost-constrained implementation: Roudier, P., Beaudette, D.E. and Hewitt, A.E. 2012. A conditioned Latin -hypercube sampling algorithm incorportaing operational constraints. In: -Digital Soil Assessments and Beyond. Proceedings of the 5th Golobal Workshop +hypercube sampling algorithm incorporating operational constraints. In: +Digital Soil Assessments and Beyond. Proceedings of the 5th Global Workshop on Digital Soil Mapping, Sydney, Australia. * For the similarity buffer prediction: diff --git a/man/clhs.Rd b/man/clhs.Rd index f5649d8..a297205 100644 --- a/man/clhs.Rd +++ b/man/clhs.Rd @@ -37,8 +37,8 @@ object.} \item{include}{A numeric vector giving the indices of the rows from \code{x} that must be included in the selected items. For the cost-constrained cLHS method, cost of these mandatory samples is set to 0. If NULL (default), all data are randomly -choosen according to the classic cLHS method. If \code{include} is not NULL, -argument \code{size} must inlcude the total size of the final sample i.e. the +chosen according to the classic cLHS method. If \code{include} is not NULL, +argument \code{size} must include the total size of the final sample i.e. the size of mandatory samples given by \code{include} plus the size of the randomly chosen samples to pick.} @@ -53,7 +53,7 @@ Metropolis-Hastings annealing process. Defaults to 10000.} \item{temp}{The initial temperature at which the simulated annealing begins. Defaults to 1.} -\item{tdecrease}{A number betwen 0 and 1, giving the rate at which +\item{tdecrease}{A number between 0 and 1, giving the rate at which temperature decreases in the simulated annealing process. Defaults to 0.95.} \item{weights}{A list a length 3, giving the relative weights for @@ -80,10 +80,10 @@ cLHS_results methods such as \code{plot.cLHS_result}).} \item{track}{A character giving the name or an integer giving the index of the attribute in \code{x} that gives a cost associated with each individual. However, this method will only track the cost - the sampling -prrocess will not be constrained by this attribute. If NULL (default), this +process will not be constrained by this attribute. If NULL (default), this option is not used.} -\item{use.coords}{Logical, if TRUE the spatial coordinates of supported spatial objects (either a `SpatialPointsDataFrame` object if using `sp`, or a `sf` object if using `sf`) are included in the Latin hypercube calculations. DDEfaults to FALSE.} +\item{use.coords}{Logical, if TRUE the spatial coordinates of supported spatial objects (either a `SpatialPointsDataFrame` object if using `sp`, or a `sf` object if using `sf`) are included in the Latin hypercube calculations. Defaults to FALSE.} \item{...}{additional parameters passed to \code{clhs}} } @@ -95,7 +95,7 @@ numeric vector containing the indices of the selected samples is returned \code{cLHS_result}, with the following elements: \item{index_samples}{a vector giving the indices of the chosen samples.} \item{sampled_data}{the sampled data.frame.} \item{obj}{a vector giving the evolution of the -objective function throughout the Meropolis-Hastings iterations.} +objective function throughout the Metropolis-Hastings iterations.} \item{cost}{a vector giving the evolution of the cost function throughout the Metropolis-Hastings iterations (if available).} } @@ -164,8 +164,8 @@ Soil Sensing, Progress in Soil Science, pages 111-119. *For the cost-constrained implementation: Roudier, P., Beaudette, D.E. and Hewitt, A.E. 2012. A conditioned Latin -hypercube sampling algorithm incorportaing operational constraints. In: -Digital Soil Assessments and Beyond. Proceedings of the 5th Golobal Workshop +hypercube sampling algorithm incorporating operational constraints. In: +Digital Soil Assessments and Beyond. Proceedings of the 5th Global Workshop on Digital Soil Mapping, Sydney, Australia. } \seealso{