Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
2dec31be
Commit
2dec31be
authored
Feb 21, 2019
by
Delaigue Olivier
Browse files
v1.1.3.11 CLEAN: remove return(NULL) after error in ErrorCrit_*
parent
5aeb635a
Changes
6
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
2dec31be
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.1.3.1
0
Version: 1.1.3.1
1
Date: 2019-02-21
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
2dec31be
...
...
@@ -13,7 +13,7 @@ output:
### 1.1.3.1
0
Release Notes (2019-02-21)
### 1.1.3.1
1
Release Notes (2019-02-21)
...
...
R/ErrorCrit_KGE.R
View file @
2dec31be
...
...
@@ -4,15 +4,12 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Arguments_check________________________________
if
(
!
inherits
(
InputsCrit
,
"InputsCrit"
))
{
stop
(
"InputsCrit must be of class 'InputsCrit'"
)
return
(
NULL
)
}
if
(
inherits
(
InputsCrit
,
"Multi"
)
|
inherits
(
InputsCrit
,
"Compo"
))
{
stop
(
"InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with KGE"
)
return
(
NULL
)
}
if
(
!
inherits
(
OutputsModel
,
"OutputsModel"
))
{
stop
(
"OutputsModel must be of class 'OutputsModel'"
)
return
(
NULL
)
}
...
...
R/ErrorCrit_KGE2.R
View file @
2dec31be
...
...
@@ -4,15 +4,12 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Arguments_check________________________________
if
(
!
inherits
(
InputsCrit
,
"InputsCrit"
))
{
stop
(
"InputsCrit must be of class 'InputsCrit'"
)
return
(
NULL
)
}
if
(
inherits
(
InputsCrit
,
"Multi"
)
|
inherits
(
InputsCrit
,
"Compo"
))
{
stop
(
"InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with KGE'"
)
return
(
NULL
)
}
if
(
!
inherits
(
OutputsModel
,
"OutputsModel"
))
{
stop
(
"OutputsModel must be of class 'OutputsModel'"
)
return
(
NULL
)
}
...
...
R/ErrorCrit_NSE.R
View file @
2dec31be
...
...
@@ -4,15 +4,12 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Arguments_check________________________________
if
(
!
inherits
(
InputsCrit
,
"InputsCrit"
))
{
stop
(
"InputsCrit must be of class 'InputsCrit'"
)
return
(
NULL
)
}
if
(
inherits
(
InputsCrit
,
"Multi"
)
|
inherits
(
InputsCrit
,
"Compo"
))
{
stop
(
"InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with NSE"
)
return
(
NULL
)
}
if
(
!
inherits
(
OutputsModel
,
"OutputsModel"
))
{
stop
(
"OutputsModel must be of class 'OutputsModel'"
)
return
(
NULL
)
}
...
...
R/ErrorCrit_RMSE.R
View file @
2dec31be
...
...
@@ -4,15 +4,12 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Arguments_check________________________________
if
(
!
inherits
(
InputsCrit
,
"InputsCrit"
))
{
stop
(
"InputsCrit must be of class 'InputsCrit'"
)
return
(
NULL
)
}
if
(
inherits
(
InputsCrit
,
"Multi"
)
|
inherits
(
InputsCrit
,
"Compo"
))
{
stop
(
"InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' with RMSE"
)
return
(
NULL
)
}
if
(
!
inherits
(
OutputsModel
,
"OutputsModel"
))
{
stop
(
"OutputsModel must be of class 'OutputsModel'"
)
return
(
NULL
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment