v1.6.9.9 refactor: simplify .ExtractOutputsModel code to manage StateEnd exception

Refs #67

v1.6.9.9 refactor: simplify .ExtractOutputsModel code to manage StateEnd exception
Refs #67
b1fcddef · Delaigue Olivier · d374b49f · b1fcddef · b1fcddef · b1fcddef
Commit b1fcddef authored 4 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 10 deletions
+4 -10
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.9.8
+Version: 1.6.9.9
 Date: 2021-01-08
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@



-### 1.6.9.8 Release Notes (2021-01-08)
+### 1.6.9.9 Release Notes (2021-01-08)

 #### New features


--- a/R/Utils.R
+++ b/R/Utils.R
@@ -131,12 +131,6 @@
 ## InputsModel

 .ExtractOutputsModel <- function(x, i) {
-  IsStateEnd <- !is.null(x$StateEnd)
-  if (IsStateEnd) {
-    IsStateEnd <- TRUE
-    StateEnd <- x$StateEnd
-    x$StateEnd <- NULL
-  }
  res <- lapply(x, function(x) {
    if (is.matrix(x)  && length(dim(x)) == 2L) {
      res0 <- x[i, ]
@@ -152,8 +146,8 @@
    }
    return(res0)
  })
-  if (IsStateEnd) {
-    res$StateEnd <- StateEnd
+  if (!is.null(x$StateEnd)) {
+    res$StateEnd <- x$StateEnd
  }
  class(res) <- class(x)
  res