From 5d1ae5d7a486b70ce3defdf16e256bb9ebd168a8 Mon Sep 17 00:00:00 2001 From: Bo Gao Date: Wed, 7 Apr 2021 01:56:13 +0100 Subject: [PATCH] incorrect indexing on `samples` for `grid` and `innergrid` The code needs correction because it takes the first element of `samples` to be the number of samples for all parameters. As specified, the number of samples to generate per parameter is specified in a vector for `grid` and `innergrid` methods. --- R/parameterSets.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/R/parameterSets.R b/R/parameterSets.R index a63a625..a537c18 100644 --- a/R/parameterSets.R +++ b/R/parameterSets.R @@ -30,19 +30,19 @@ parameterSets<-function(par.ranges,samples,method=c("sobol","innergrid","grid")) points=lapply(1:length(par.ranges), function(i) seq(par.ranges[[i]][1]+offsets[i], par.ranges[[i]][2]-offsets[i], - length.out=samples[[1]])) + length.out=samples[[i]])) names(points)<-names(par.ranges) return(as.matrix(do.call(expand.grid,points))) }, "grid"={ if(length(samples)==1) samples<-rep(samples,length(par.ranges)) - points=lapply(par.ranges, - function(r) seq(r[1], - r[2], - length.out=samples[[1]])) + points=lapply(1:length(par.ranges), + function(i) seq(par.ranges[[i]][1], + par.ranges[[i]][2], + length.out=samples[[i]])) names(points)<-names(par.ranges) return(as.matrix(do.call(expand.grid,points))) } ) -} \ No newline at end of file +}