Skip to content
Snippets Groups Projects
Commit 3fa10ced authored by Mauricio Zambrano-Bigiarini's avatar Mauricio Zambrano-Bigiarini
Browse files

hydroPSO: default value cahnged for 'TVlambda.exp

parent e5a79fd7
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,9 @@ NEWS/ChangeLog for hydroPSO ...@@ -12,7 +12,9 @@ NEWS/ChangeLog for hydroPSO
-) default value for the time-varying c2 was changed from (non-linearly increasing) 'TVc1.rng= c(1.8, 2.2)' to -) default value for the time-varying c2 was changed from (non-linearly increasing) 'TVc1.rng= c(1.8, 2.2)' to
'TVc2.rng= c(1.05, 1.28)'. However, by default 'use.TVc2= FALSE' still. 'TVc2.rng= c(1.05, 1.28)'. However, by default 'use.TVc2= FALSE' still.
-) default value for the time-varying lambda was changed from (non-linearly decreasing) 'TVlambda.rng= c(0.9, 0.1)' to -) default value for the time-varying lambda was changed from (non-linearly decreasing) 'TVlambda.rng= c(0.9, 0.1)' to
'TVlambda.rng= c(1, 0.25)'. However, by default 'use.TVlambda= FALSE' 'TVlambda.rng= c(1, 0.25)'. However, by default 'use.TVlambda= FALSE' still.
-) default value for the exponent of the time-varying lambda was changed from 'TVlambda.exp= 1.7' to 'TVlambda.exp= 1'.
However, by default 'use.TVlambda= FALSE' still.
-) source code was tidy up -) source code was tidy up
0.1-56 14-Jun-2012 0.1-56 14-Jun-2012
......
...@@ -1394,7 +1394,7 @@ hydroPSO <- function( ...@@ -1394,7 +1394,7 @@ hydroPSO <- function(
use.IW = TRUE, IW.type=c("linear", "non-linear", "runif", "aiwf", "GLratio"), IW.w=1/(2*log(2)), IW.exp= 1, use.IW = TRUE, IW.type=c("linear", "non-linear", "runif", "aiwf", "GLratio"), IW.w=1/(2*log(2)), IW.exp= 1,
use.TVc1= FALSE, TVc1.type=c("non-linear", "linear", "GLratio"), TVc1.rng= c(1.28, 1.05), TVc1.exp= 1.5, use.TVc1= FALSE, TVc1.type=c("non-linear", "linear", "GLratio"), TVc1.rng= c(1.28, 1.05), TVc1.exp= 1.5,
use.TVc2= FALSE, TVc2.type=c("non-linear", "linear"), TVc2.rng= c(1.05, 1.28), TVc2.exp= 1.5, use.TVc2= FALSE, TVc2.type=c("non-linear", "linear"), TVc2.rng= c(1.05, 1.28), TVc2.exp= 1.5,
use.TVlambda=FALSE, TVlambda.type=c("non-linear", "linear"), TVlambda.rng= c(1, 0.25), TVlambda.exp= 1.7, use.TVlambda=FALSE, TVlambda.type=c("non-linear", "linear"), TVlambda.rng= c(1, 0.25), TVlambda.exp= 1,
use.RG = FALSE, RG.thr= 1.1e-4, RG.r= 0.8, RG.miniter= 5, # RG.r not used in reagrouping use.RG = FALSE, RG.thr= 1.1e-4, RG.r= 0.8, RG.miniter= 5, # RG.r not used in reagrouping
plot=FALSE, plot=FALSE,
......
...@@ -249,7 +249,7 @@ numeric, initial and final values for the percentage to limit the maximum veloci ...@@ -249,7 +249,7 @@ numeric, initial and final values for the percentage to limit the maximum veloci
\item{TVlambda.exp}{ \item{TVlambda.exp}{
OPTIONAL. only required when \code{use.TVlambda= TRUE} AND \code{TVlambda.type='non-linear'} \cr OPTIONAL. only required when \code{use.TVlambda= TRUE} AND \code{TVlambda.type='non-linear'} \cr
numeric, non-linear modulation index \cr numeric, non-linear modulation index \cr
When \code{TVlambda.type= linear} \code{TVlambda.exp} is automatically set to 1 When \code{TVlambda.type='linear'} \code{TVlambda.exp} is automatically set to 1
} }
\item{use.RG}{ \item{use.RG}{
logical, indicates if the swarm should be regrouped when premature convergence is detected. When \code{use.RG=TRUE} the swarm is regrouped in a search space centred around the current global best. This updated search space is hoped to be both small enough for efficient search and large enough to allow the swarm to escape from stagnation (see Evers and Ghalia, 2009) logical, indicates if the swarm should be regrouped when premature convergence is detected. When \code{use.RG=TRUE} the swarm is regrouped in a search space centred around the current global best. This updated search space is hoped to be both small enough for efficient search and large enough to allow the swarm to escape from stagnation (see Evers and Ghalia, 2009)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment