Upgrade roxygen & Fixes #3

DESCRIPTION

@@ -1,27 +1,28 @@
 Package: pse
 Type: Package
 Title: Parameter Space Exploration with Latin Hypercubes
-Version: 0.4.4
-Date: 2015-10-02
+Version: 0.4.5
+Date: 2016-03-14
 Author: Andre Chalom, Paulo Inacio Knegt Lopez de Prado
 Maintainer: Andre Chalom <[email protected]>
-Depends: 
-    R (>= 3.0.1), 
-    Hmisc 
+Depends:
+    R (>= 3.0.1),
+    Hmisc
 Imports:
     utils,
     graphics,
     stats,
-    boot, 
+    boot,
     parallel
-Suggests: 
-    sensitivity, 
+Suggests:
+    sensitivity,
     mcmc
 Description: Functions for creating Latin Hypercubes with
-	prescribed correlations and performing parameter space exploration.
-	Also implements the PLUE method.
-	Based on the package sensitivity, by Gilles Pujol, 
-	Bertrand Iooss & Alexandre Janon.
+    prescribed correlations and performing parameter space exploration.
+    Also implements the PLUE method.
+    Based on the package sensitivity, by Gilles Pujol,
+    Bertrand Iooss & Alexandre Janon.
 License: GPL-3
 URL: https://github.com/andrechalom/pse
-BugReports: https://github.com/andrechalom/pse 
+BugReports: https://github.com/andrechalom/pse
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 S3method(pic,LHS)
 S3method(pic,default)

R/LHS.R

@@ -50,6 +50,8 @@
 #'				generate a zero-correlation Latin Hypercube.
 #'		`eps'   The tolerance between the prescribed correlation and the actual correlation present in the
 #'				generated Latin Hypercube.
+#'		`maxIt' The maximum number of iterations to be run for each factor. The default is set by a heuristic,
+#'              but it might need some adjustments.
 #'@param nboot Number of bootstrap replicates for calculating the PRCC.
 #'@param repetitions The number of model repetitions to be run for a single data point. See the vignette on 
 #'		stochastic models for details
@@ -94,7 +96,7 @@ LHS <-
 			  opts=list(), nboot=0, repetitions=1, cl = NULL) {
 		# Input validation for common errors and "default" value handling:
 		method = match.arg(method)
-		my.opts = list(COR=0, eps=0.0005)
+		my.opts = list(COR=0, eps=0.0005, maxIt=0)
 		my.opts[names(opts)] <- opts
 		if(is.numeric(factors) && length(factors) == 1) factors=paste("I", 1:factors, sep="")
 		else if (!is.character(factors)) {
@@ -119,7 +121,7 @@ LHS <-
 			L[,i] <- sample(do.call(q[[i]], c(list(p = 1:N/N-1/N/2), q.arg[[i]])))
 		# Corrects the correlation terms, for HL method for LHS
 		if (method == "HL") {
-			L <- LHScorcorr(L, COR = my.opts$COR, eps = my.opts$eps); 
+			L <- LHScorcorr(L, COR = my.opts$COR, eps = my.opts$eps, maxIt = my.opts$maxIt); 
 		}
 		# Runs the actual model
 		res <- internal.run(cl, model, L, repetitions)