From 50b3d10f7d38790545b69323595ae2910a1a719d Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Fri, 3 May 2019 09:02:47 +0200
Subject: [PATCH] v1.2.15.5 CLEAN: minor syntax revisions in plot.OutputsModel
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/plot.OutputsModel.R | 30 +++++++++++++++---------------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 763dff67..af836ffd 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.15.4
-Date: 2019-05-02
+Version: 1.2.15.5
+Date: 2019-05-03
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
diff --git a/NEWS.rmd b/NEWS.rmd
index f59e604b..9e4c3422 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.2.15.34 Release Notes (2019-05-02)
+### 1.2.15.5 Release Notes (2019-05-03)
#### New features
diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R
index 3e0af2c1..9b4a2d3c 100644
--- a/R/plot.OutputsModel.R
+++ b/R/plot.OutputsModel.R
@@ -174,12 +174,12 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
}
BOOL_QobsZero <- FALSE
if (BOOL_Qobs) {
- SelectQobsNotZero <- (round(Qobs[IndPeriod_Plot] , 4) != 0)
+ SelectQobsNotZero <- round(Qobs[IndPeriod_Plot], 4) != 0
BOOL_QobsZero <- sum(!SelectQobsNotZero, na.rm = TRUE) > 0
}
BOOL_QsimZero <- FALSE
if (BOOL_Qsim) {
- SelectQsimNotZero <- (round(OutputsModel$Qsim[IndPeriod_Plot], 4) != 0)
+ SelectQsimNotZero <- round(OutputsModel$Qsim[IndPeriod_Plot], 4) != 0
BOOL_QsimZero <- sum(!SelectQsimNotZero, na.rm = TRUE) > 0
}
if (BOOL_QobsZero & verbose) {
@@ -191,15 +191,15 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
BOOL_FilterZero <- TRUE
## Plots_choices
- BOOLPLOT_Precip <- ( "Precip" %in% which & BOOL_Pobs )
- BOOLPLOT_PotEvap <- ( "PotEvap" %in% which & BOOL_Eobs )
- BOOLPLOT_Temp <- ( "Temp" %in% which & BOOL_Snow )
- BOOLPLOT_SnowPack <- ( "SnowPack" %in% which & BOOL_Snow )
- BOOLPLOT_Flows <- ( "Flows" %in% which & (BOOL_Qsim | BOOL_Qobs) )
- BOOLPLOT_Error <- ( "Error" %in% which & BOOL_Error )
- BOOLPLOT_Regime <- ( "Regime" %in% which & BOOL_TS & BOOL_Qsim & (NameTS %in% c("hour", "day", "month")) )
- BOOLPLOT_CumFreq <- ( "CumFreq" %in% which & (BOOL_Qsim | BOOL_Qobs) & BOOL_FilterZero )
- BOOLPLOT_CorQQ <- ( "CorQQ" %in% which & (BOOL_Qsim & BOOL_Qobs) & BOOL_FilterZero )
+ BOOLPLOT_Precip <- "Precip" %in% which & BOOL_Pobs
+ BOOLPLOT_PotEvap <- "PotEvap" %in% which & BOOL_Eobs
+ BOOLPLOT_Temp <- "Temp" %in% which & BOOL_Snow
+ BOOLPLOT_SnowPack <- "SnowPack" %in% which & BOOL_Snow
+ BOOLPLOT_Flows <- "Flows" %in% which & (BOOL_Qsim | BOOL_Qobs)
+ BOOLPLOT_Error <- "Error" %in% which & BOOL_Error
+ BOOLPLOT_Regime <- "Regime" %in% which & BOOL_TS & BOOL_Qsim & (NameTS %in% c("hour", "day", "month"))
+ BOOLPLOT_CumFreq <- "CumFreq" %in% which & (BOOL_Qsim | BOOL_Qobs) & BOOL_FilterZero
+ BOOLPLOT_CorQQ <- "CorQQ" %in% which & (BOOL_Qsim & BOOL_Qobs) & BOOL_FilterZero
## Options
@@ -773,9 +773,9 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
Quant <- as.numeric(quantile(DATA2, SeqQuant, na.rm = TRUE))
Fn <- ecdf(DATA2)
YY <- DATA2
- YY <- YY[order( Fn(DATA2) )]
+ YY <- YY[order(Fn(DATA2))]
XX <- Fn(DATA2)
- XX <- XX[order( Fn(DATA2) )]
+ XX <- XX[order(Fn(DATA2))]
lines(XX, YY, lwd = lwd, col = par("fg"))
txtleg <- c(txtleg, "observed")
colleg <- c(colleg, par("fg"))
@@ -786,9 +786,9 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
Quant <- as.numeric(quantile(DATA2, SeqQuant, na.rm = TRUE))
Fn <- ecdf(DATA2)
YY <- DATA2
- YY <- YY[order( Fn(DATA2) )]
+ YY <- YY[order(Fn(DATA2))]
XX <- Fn(DATA2)
- XX <- XX[order( Fn(DATA2) )]
+ XX <- XX[order(Fn(DATA2))]
lines(XX, YY, lwd = lwd, col = "orangered")
txtleg <- c(txtleg, "simulated")
colleg <- c(colleg, "orangered")
--
GitLab