diff --git a/DESCRIPTION b/DESCRIPTION index 84ff7b7522698023e913a2afcfc7e3a69c97d62e..e82d11ffc958729d401453a528dfde94afcba9f0 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: hydroPSO Type: Package Title: Model-Independent Particle Swarm Optimisation for Environmental Models -Version: 0.1-58-30 -Date: 2012-11-26 +Version: 0.1-58-31 +Date: 2012-11-27 Authors@R: c(person("Mauricio", "Zambrano-Bigiarini", email="mzb.devel@gmail.com", role=c("aut","cre")), person("Rodrigo", "Rojas", email="Rodrigo.RojasMujica@gmail.com", role=c("ctb")) ) Maintainer: Mauricio Zambrano-Bigiarini <mzb.devel@gmail.com> Description: This package implements a state-of-the-art version of the Particle Swarm Optimisation (PSO) algorithm (SPSO-2011 and SPSO-2007 capable), with a special focus on the calibration of environmental models. hydroPSO is model-independent, allowing the user to easily interface any model code with the calibration engine (PSO). It includes a series of controlling options and PSO variants to fine-tune the performance of the calibration engine to different calibration problems. An advanced sensitivity analysis function together with user-friendly plotting summaries facilitate the interpretation and assessment of the calibration results. Bugs reports/comments/questions are very welcomed. diff --git a/inst/vignette/hydroPSO_vignette.Rnw b/inst/vignette/hydroPSO_vignette.Rnw index c0be0ff3b816f31c51871d977eac9db866489e1c..e3b01eb8c15c35c257168586e503aec40310246f 100644 --- a/inst/vignette/hydroPSO_vignette.Rnw +++ b/inst/vignette/hydroPSO_vignette.Rnw @@ -1,5 +1,5 @@ -\documentclass[a4paper,12pt]{article} -%\documentclass[a4paper,12pt]{scrartcl} +%\documentclass[a4paper,12pt]{article} +\documentclass[a4paper,12pt]{scrartcl} \author{Rodrigo Rojas, PhD \\ Mauricio Zambrano-Bigiarini, PhD} @@ -501,10 +501,10 @@ n parn minn maxn \begin{enumerate} -\item Use next commands to retrieve current working directory, set a new working directory, and printing files included in the current directory, respectively. +\item In the R console, use next commands to retrieve current working directory, set a new working directory, and list the files included in the new working directory, respectively. <<eval=FALSE>>= getwd() -setwd("~/tmp") +setwd("~") list.files(".") @ @@ -709,7 +709,8 @@ From the previous results we see that the regrouping strategy allows particles e <<eval=TRUE>>= setwd("./PSO.out.rastr") -conv <- read_convergence(do.png=TRUE,png.fname="ConvergenceMeasuresRG.png") +conv <- read_convergence(do.png=TRUE, + png.fname="ConvergenceMeasuresRG.png") @