Skip to content
GitLab
Commit 6da405c2 authored by Delaigue Olivier's avatar Delaigue Olivier Committed by Dorchies David
Browse files

v1.4.4.22 CLEAN: minor text revision of error message in SeriesAggreg #41

parent 2c49cda5
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 96-parallelize-the-grid-screening-step-during-calibration master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21
2 merge requests!26CRAN v1.6.9.21,!12New series aggreg
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 2 deletions
+10 -2
DESCRIPTION
+ 1
− 1
View file @ 6da405c2
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.4.21 Version: 1.4.4.22
Date: 2020-04-20 Date: 2020-04-20
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NAMESPACE
+ 8
− 0
View file @ 6da405c2
...@@ -9,6 +9,10 @@ useDynLib(airGR, .registration = TRUE) ...@@ -9,6 +9,10 @@ useDynLib(airGR, .registration = TRUE)
## S3 methods ## ## S3 methods ##
##################################### #####################################
S3method("plot", "OutputsModel") S3method("plot", "OutputsModel")
S3method("SeriesAggreg2", "InputsModel")
S3method("SeriesAggreg2", "OutputsModel")
S3method("SeriesAggreg2", "default")
...@@ -62,6 +66,10 @@ export(TransfoParam_Lag) ...@@ -62,6 +66,10 @@ export(TransfoParam_Lag)
export(plot.OutputsModel) export(plot.OutputsModel)
exportPattern(".FortranOutputs") exportPattern(".FortranOutputs")
exportPattern(".ErrorCrit") exportPattern(".ErrorCrit")
exportMethods(SeriesAggreg2.InputsModel)
exportMethods(SeriesAggreg2.OutputsModel)
exportMethods(SeriesAggreg2.default)
......
R/SeriesAggreg2.R
+ 1
− 1
View file @ 6da405c2
...@@ -38,7 +38,7 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF ...@@ -38,7 +38,7 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF
## check TabSeries other columns (boolean converted to numeric) ## check TabSeries other columns (boolean converted to numeric)
apply(TabSeries[, -1L], MARGIN = 2, FUN = function(iCol) { apply(TabSeries[, -1L], MARGIN = 2, FUN = function(iCol) {
if (!is.numeric(iCol)) { if (!is.numeric(iCol)) {
stop("'TabSeries' columns (other than the first one) be of numeric class") stop("'TabSeries' columns (other than the first one) must be of numeric class")
} }
}) })
## check Format ## check Format
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment