From 7dc82d2924f6293505475932f75f8e6881a1aac2 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 16 Nov 2020 08:55:47 +0100
Subject: [PATCH] v1.6.3.59 style: simplify the condition tests in the
 RunModel_GR* functions Refs #14

---
 DESCRIPTION       | 2 +-
 NEWS.md           | 2 +-
 R/RunModel_GR2M.R | 6 +++---
 R/RunModel_GR4H.R | 6 +++---
 R/RunModel_GR4J.R | 6 +++---
 R/RunModel_GR5H.R | 6 +++---
 R/RunModel_GR5J.R | 6 +++---
 R/RunModel_GR6J.R | 6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 09740262..bf61cd20 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.3.58
+Version: 1.6.3.59
 Date: 2020-11-16
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 1307e01a..1453cbd2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
 
 
 
-### 1.6.3.58 Release Notes (2020-11-16)
+### 1.6.3.59 Release Notes (2020-11-16)
 
 #### New features
 
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index ab6ab67b..65d5e1a3 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -97,19 +97,19 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                        lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                        list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R
index 38d0cfd5..7090844b 100644
--- a/R/RunModel_GR4H.R
+++ b/R/RunModel_GR4H.R
@@ -102,19 +102,19 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R
index 96e8cc71..9720662a 100644
--- a/R/RunModel_GR4J.R
+++ b/R/RunModel_GR4J.R
@@ -101,19 +101,19 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_StateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R
index cf2cce4c..e0f70bd1 100644
--- a/R/RunModel_GR5H.R
+++ b/R/RunModel_GR5H.R
@@ -112,19 +112,19 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_StateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R
index edd304c2..1af193e5 100644
--- a/R/RunModel_GR5J.R
+++ b/R/RunModel_GR5J.R
@@ -102,19 +102,19 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R
index 376604a6..46e5fc8d 100644
--- a/R/RunModel_GR6J.R
+++ b/R/RunModel_GR6J.R
@@ -107,19 +107,19 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
-- 
GitLab