diff --git a/NEWS b/NEWS index 6655c05a6ebe84d5c229d4ef8199fd7ab80a691f..c58ff79c90ed0a087f4abec87fe1b91cc1283b23 100755 --- a/NEWS +++ b/NEWS @@ -109,6 +109,8 @@ NEWS/ChangeLog for hydroPSO -) argument 'sim' may also be 'integer' (before it had to be 'numeric', which does not allow 'integer' objects !) o 'plot_NparOF' : -) new argument 'beh.thr' to allow selecting only behavioral parameter sets + + o 'params2ecdf' : -) new arguments 'gofs', 'MinMax' and 'beh.thr' o new function 'pest2hydroPSO' for importing PEST input files into hydroPSO o new function 'hydroPSO2pest' for exporting hydroPSO input files to PEST diff --git a/R/params2ecdf.R b/R/params2ecdf.R index 7eace840ba3518a62f460cd10ebc245b7d0f866b..c7791a12059a18e9b8c406663f09ee461c1e32e9 100755 --- a/R/params2ecdf.R +++ b/R/params2ecdf.R @@ -36,6 +36,11 @@ params2ecdf <- function(params, ...) UseMethod("params2ecdf") ################################################################################ params2ecdf.default <- function(params, param.names=NULL, + + gofs, + MinMax=NULL, + beh.thr=NA, + weights=NULL, byrow=FALSE, plot=TRUE, diff --git a/R/plot_NparOF.R b/R/plot_NparOF.R index a573a067eeb417462f264fb963e5e29813163d22..223517739bc13fbaf5f35a4b4b1a8ee9d35765ad 100755 --- a/R/plot_NparOF.R +++ b/R/plot_NparOF.R @@ -59,6 +59,12 @@ plot_NparOF <- function(params, # Setting 'MinMax' MinMax <- match.arg(MinMax) + # Checking 'beh.thr' + if ( !is.na(beh.thr) ) { + if ( is.null(gofs) ) + stop("Missing argument: 'gofs' has to be provided before using 'beh.thr' !!") + } # IF end + # Number of parameters that will be analysed npar <- length(param.names)