diff --git a/NEWS b/NEWS index 74cfe9126f4eb6d1dd06cbd38f774544db270a7f..eecf9d3f516831854e7fbf16290d7cb365dadeb9 100755 --- a/NEWS +++ b/NEWS @@ -2,10 +2,14 @@ NEWS/ChangeLog for hydroPSO -------------------------- 0.1-55 XX-May-2012 - o 'hydromod': -) 'sim' and 'obs' are now checked for time attributes when 'gof.Ini' and/or 'gof.Fin' is/are used (thanks to M. Leh for reporting !) - o 'hydroPSO': -) fixed bug originated when 'gof.Ini' and/or 'gof.Fin' was/were not given as parameters for .model.FUN.args. - This bug orginated the following error during the run of the model with the best parameter set: - "Error in as.Date.default(model.FUN.args[["gof.Ini"]]) : do not know how to convert 'model.FUN.args[["gof.Ini"]]' to class "Date" " + o 'hydromod' : -) 'sim' and 'obs' are now checked for time attributes when 'gof.Ini' and/or 'gof.Fin' is/are used + (thanks to M. Leh for reporting !) + o 'hydroPSO' : -) fixed bug originated when 'gof.Ini' and/or 'gof.Fin' was/were not given as parameters for .model.FUN.args. + (thanks to M. Leh for reporting !) + This bug orginated the following error during the run of the model with the best parameter set: + "Error in as.Date.default(model.FUN.args[["gof.Ini"]]) : do not know how to convert 'model.FUN.args[["gof.Ini"]]' to class "Date" " + o 'plot_results' : the default value for 'ftype' was changed from "dm" to "o" + o 'plot_out' : the default value for 'ftype' was changed from "dm" to "o" ############################################################## # Previous Releases: see old file 'ChangeLog' for details # diff --git a/R/plot_out.R b/R/plot_out.R index 60f60cf94f7db7e1c5499a32637fa01143a766a0..fa698c1e1fa3c28fd98d2b851bacfdd545c23242 100755 --- a/R/plot_out.R +++ b/R/plot_out.R @@ -25,7 +25,7 @@ plot_out <- function(sim, obs, ptype=c("corr", "ts", "ecdf", "quant2ecdf"), MinMax=NULL, #beh.thr=NA, - ftype="dm", # OPTIONAL, only used when 'ptype=="ts"'.See [hydroGOF]{ggof} + ftype="o", # OPTIONAL, only used when 'ptype=="ts"'.See [hydroGOF]{ggof} FUN=mean, # OPTIONAL, only used when 'ptype=="ts"'.See [hydroGOF]{ggof} verbose=TRUE, diff --git a/R/plot_results.R b/R/plot_results.R index fc29758b281e9b4f1cec7171ccebf5b12699fadf..70e4ec76c7fab04ee9572cb57bdc8e86541906d9 100755 --- a/R/plot_results.R +++ b/R/plot_results.R @@ -57,7 +57,7 @@ plot_results <- function(drty.out="PSO.out", ####################################################### # Parameters for BestSim vs Obs ('plot_out') modelout.cols=NULL, - ftype="dm", + ftype="o", FUN=mean, #### OPTIONS for ('plot_out') ##### quantiles.desired= c(0.05, 0.5, 0.95), diff --git a/man/ReadPlot_out.Rd b/man/ReadPlot_out.Rd index e076ca94e1c8d929afe1c7faf6c19534e98d1548..63d64680a7ed6787ea593ba363afd59ec1e7d72c 100755 --- a/man/ReadPlot_out.Rd +++ b/man/ReadPlot_out.Rd @@ -24,7 +24,7 @@ read_out(file="Model_out.txt", modelout.cols=NULL, obs, MinMax=NULL, beh.thr=NA, cex.axis=1.2, cex.main=1.2, cex.lab=1.2, do.png=FALSE, png.width=1500, png.height=900, png.res=90, png.fname="ModelOut_vs_Obs.png") plot_out(sim, obs, dates=NULL, ptype=c("corr", "ts", "ecdf", "quant2ecdf"), - MinMax=NULL, ftype="dm", FUN=mean, verbose=TRUE, weights=NULL, byrow=TRUE, + MinMax=NULL, ftype="o", FUN=mean, verbose=TRUE, weights=NULL, byrow=TRUE, quantiles.desired= c(0.05,0.5,0.95), quantiles.labels=c("Q5","Q50","Q95"), main=NULL, ylab="Probability", col="blue", leg.cex=1.2, leg.pos="bottomright", cex.axis=1.2, cex.main=1.2, cex.lab=1.2, diff --git a/man/ReadPlot_results.Rd b/man/ReadPlot_results.Rd index c3017db4dde505953973639893a18e96e6fe6030..3deb4da4eeb457f65abb85ca08d6385ecad404c9 100755 --- a/man/ReadPlot_results.Rd +++ b/man/ReadPlot_results.Rd @@ -56,7 +56,7 @@ plot_results(drty.out="PSO.out", param.names, gof.name="GoF", MinMax=NULL, ptype="one", %% Parameters for 'plot_out' modelout.cols=NULL, - ftype="dm", FUN=mean, + ftype="o", FUN=mean, quantiles.desired= c(0.05,0.5,0.95), quantiles.labels= c("Q5","Q50","Q95"), %% Parameters for plot_convergence' legend.pos="topright",