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
d7162e4f
Commit
d7162e4f
authored
Aug 29, 2018
by
Delaigue Olivier
Browse files
v1.0.13.7 remove tests on Ind_zeroes in ErrorCrit* functions
parent
493d6154
Changes
6
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
d7162e4f
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.13.
6
Version: 1.0.13.
7
Date: 2018-08-29
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
d7162e4f
...
...
@@ -14,7 +14,7 @@ output:
### 1.0.13.
6
Release Notes (2018-08-29)
### 1.0.13.
7
Release Notes (2018-08-29)
#### Deprectated and defunct
...
...
R/ErrorCrit_KGE.R
View file @
d7162e4f
...
...
@@ -42,11 +42,9 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
##Data_transformation
if
(
"Ind_zeroes"
%in%
names
(
InputsCrit
)
&
"epsilon"
%in%
names
(
InputsCrit
))
{
if
(
length
(
InputsCrit
$
Ind_zeroes
)
>
0
)
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
"epsilon"
%in%
names
(
InputsCrit
)
&
!
is.null
(
InputsCrit
$
epsilon
))
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
InputsCrit
$
transfo
==
"sqrt"
)
{
VarObs
<-
sqrt
(
VarObs
)
...
...
R/ErrorCrit_KGE2.R
View file @
d7162e4f
...
...
@@ -42,11 +42,9 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
##Data_transformation
if
(
"Ind_zeroes"
%in%
names
(
InputsCrit
)
&
"epsilon"
%in%
names
(
InputsCrit
))
{
if
(
length
(
InputsCrit
$
Ind_zeroes
)
>
0
)
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
"epsilon"
%in%
names
(
InputsCrit
)
&
!
is.null
(
InputsCrit
$
epsilon
))
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
InputsCrit
$
transfo
==
"sqrt"
)
{
VarObs
<-
sqrt
(
VarObs
)
...
...
R/ErrorCrit_NSE.R
View file @
d7162e4f
...
...
@@ -42,11 +42,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
##Data_transformation
if
(
"Ind_zeroes"
%in%
names
(
InputsCrit
)
&
"epsilon"
%in%
names
(
InputsCrit
))
{
if
(
length
(
InputsCrit
$
Ind_zeroes
)
>
0
)
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
"epsilon"
%in%
names
(
InputsCrit
)
&
!
is.null
(
InputsCrit
$
epsilon
))
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
InputsCrit
$
transfo
==
"sqrt"
)
{
VarObs
<-
sqrt
(
VarObs
)
...
...
R/ErrorCrit_RMSE.R
View file @
d7162e4f
...
...
@@ -42,11 +42,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
##Data_transformation
if
(
"Ind_zeroes"
%in%
names
(
InputsCrit
)
&
"epsilon"
%in%
names
(
InputsCrit
))
{
if
(
length
(
InputsCrit
$
Ind_zeroes
)
>
0
)
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
"epsilon"
%in%
names
(
InputsCrit
)
&
!
is.null
(
InputsCrit
$
epsilon
))
{
VarObs
<-
VarObs
+
InputsCrit
$
epsilon
VarSim
<-
VarSim
+
InputsCrit
$
epsilon
}
if
(
InputsCrit
$
transfo
==
"sqrt"
)
{
VarObs
<-
sqrt
(
VarObs
)
...
...
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