diff --git a/R/PSO_v2012.R b/R/PSO_v2012.R index d1b672c8e64d0fc2a904b162c17f67a1c7c88820..72054f1758a35438121030d76bac703e56c5d1d5 100755 --- a/R/PSO_v2012.R +++ b/R/PSO_v2012.R @@ -1207,11 +1207,12 @@ RegroupingSwarm <- function(x, xMinMax <- cbind(xmin, xmax) + message("Gbest:") + print(gbest) message("BoundariesNew:") print(xMinMax) message(" ") - message("Gbest:") - print(gbest) + #message("NewX :") #print(x) @@ -2165,6 +2166,16 @@ hydroPSO <- function( writeLines(c("lambda :", lambda), PSOparam.TextFile, sep=" ") writeLines("", PSOparam.TextFile) } # ELSE end + writeLines(c("use.RG :", use.RG), PSOparam.TextFile, sep=" ") + writeLines("", PSOparam.TextFile) + if (use.RG) { + writeLines(c("RG.thr :", RG.thr), PSOparam.TextFile, sep=" ") + writeLines("", PSOparam.TextFile) + writeLines(c("RG.r :", RG.r), PSOparam.TextFile, sep=" ") + writeLines("", PSOparam.TextFile) + writeLines(c("RG.miniter :", RG.miniter), PSOparam.TextFile, sep=" ") + writeLines("", PSOparam.TextFile) + } # IF end writeLines(c("maxfn :", maxfn), PSOparam.TextFile, sep=" ") writeLines("", PSOparam.TextFile) writeLines(c("abstol :", abstol), PSOparam.TextFile, sep=" ")