From d0a08f220e55fab87715ed64fb362b292005f353 Mon Sep 17 00:00:00 2001
From: Mauricio Zambrano-Bigiarini <hzambran@users.noreply.github.com>
Date: Mon, 19 Nov 2012 23:38:51 +0000
Subject: [PATCH] plot\_NparOF.R: added checking for 'gofs'
---
R/plot_NparOF.R | 2 +-
R/plot_particles.R | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/R/plot_NparOF.R b/R/plot_NparOF.R
index 2235177..29d0c56 100755
--- a/R/plot_NparOF.R
+++ b/R/plot_NparOF.R
@@ -48,7 +48,7 @@ plot_NparOF <- function(params,
stop("Missing argument: 'params' must be provided !!" )
# Number of parameter sets
- n <- nrow(params)
+ n <- NROW(params)
# Checking 'gofs'
if (missing(gofs)) {
diff --git a/R/plot_particles.R b/R/plot_particles.R
index 1b2dc26..c4bde5d 100755
--- a/R/plot_particles.R
+++ b/R/plot_particles.R
@@ -82,11 +82,17 @@ plot_particles <- function(#####################################################
# Checking that 'params' exists
if ( missing(params) ) stop( "Missing argument: 'params'" )
- # Checking that 'gofs' exists
- if ( missing(gofs) ) stop( "Missing argument: 'gofs'" )
-
# number of parameters
nparam <- ncol(params)
+
+ # Number of parameter sets
+ n <- NROW(params)
+
+ # Checking 'gofs'
+ if (missing(gofs)) {
+ stop("Missing argument: 'gofs' must be provided !!" )
+ } else if (length(gofs) != n)
+ stop("Invalid argument: 'length(gofs) != nrow(params)' (", length(gofs), "!=", n, ") !!" )
# Parameter names
param.names <- colnames(params)
--
GitLab