From 87f3bb8716578ba52be6086118e50dfb03bbbd6a Mon Sep 17 00:00:00 2001
From: Mauricio Zambrano-Bigiarini <hzambran@users.noreply.github.com>
Date: Mon, 11 Jun 2012 15:23:55 +0000
Subject: [PATCH] 'plot_results': 'drty.out' is now checked for existence
before reading the results.
---
NEWS | 7 ++++---
R/plot_results.R | 7 ++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 9780493..4f136e1 100755
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,10 @@ NEWS/ChangeLog for hydroPSO
0.1-56 11-Jun-2012
- o 'hydroPSO' : -) the convergence of the algorithm controlled by 'reltol' is now defined by : reltol <= normalised swarm radius,
- instead of reltol <= [ gbest(iter) / ( gbest(iter-1) +reltol ) ]
- -) minor change: 'gbest.fit.prior' is now initialized in 'gbest.fit' instead of 'gbest.fit + 10*reltol'
+ o 'hydroPSO' : -) the convergence of the algorithm controlled by 'reltol' is now defined by : reltol <= normalised swarm radius,
+ instead of reltol <= [ gbest(iter) / ( gbest(iter-1) +reltol ) ]
+ -) minor change: 'gbest.fit.prior' is now initialized in 'gbest.fit' instead of 'gbest.fit + 10*reltol'
+ o 'plot_results': -) 'drty.out' is now checked for existence before reading the results.
0.1-55 11-May-2012
diff --git a/R/plot_results.R b/R/plot_results.R
index 70e4ec7..0eb78dd 100755
--- a/R/plot_results.R
+++ b/R/plot_results.R
@@ -9,7 +9,8 @@
################################################################################
# Author : Mauricio Zambrano-Bigiarini & Rodrigo Rojas #
# Started: 10-Nov-2011, #
-# Updates: 13-Ene-2012 ; 15-Feb-2012 ; 21-Feb-2012 ; 09-Mar-2012 ; 23-Mar-2012 #
+# Updates: 13-Ene-2012 ; 15-Feb-2012 ; 21-Feb-2012 ; 09-Mar-2012 ; 23-Mar-2012 #
+# 11-Jun-2012
################################################################################
plot_results <- function(drty.out="PSO.out",
@@ -96,6 +97,10 @@ plot_results <- function(drty.out="PSO.out",
# Full path to 'drty.out'
if (basename(drty.out) == drty.out)
drty.out <- paste(getwd(), "/", drty.out, sep="")
+
+ # Checking 'drty.out' if necessary
+ if ( !file.exists(drty.out) )
+ stop("Invalid argument: the directory '", drty.out, "' does not exist !")
# PNG directory
png.drty <- "pngs"
--
GitLab