Commit bb0b67fd authored by fbourgin's avatar fbourgin
Browse files

update evalhyd-cpp and remove WSS and AWI from tests

No related merge requests found
Pipeline #47896 passed with stage
in 5 minutes and 41 seconds
Showing with 4 additions and 18 deletions
+4 -18
Subproject commit a8c62cd26901feb3ff1d745a24569a3814d0f023 Subproject commit 805e4a6af9271dec04e55417d7539b7c09841f40
0.9821120161733,0.9880951944476
0.6621887740287,0.4360388849930
...@@ -17,7 +17,7 @@ all_metrics = c( ...@@ -17,7 +17,7 @@ all_metrics = c(
# 'RANK_HIST', 'DS', 'AS', # 'RANK_HIST', 'DS', 'AS',
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# intervals # intervals
'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS', 'CR', 'AW', 'AWN', 'WS',
# multivariate # multivariate
'ES' 'ES'
) )
......
...@@ -40,7 +40,7 @@ metrics = c("BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG", "CRPS_FROM_BS", ...@@ -40,7 +40,7 @@ metrics = c("BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG", "CRPS_FROM_BS",
"CRPS_FROM_ECDF", "CRPS_FROM_ECDF",
"QS", "CRPS_FROM_QS", "QS", "CRPS_FROM_QS",
"POD", "POFD", "FAR", "CSI", "ROCSS", "POD", "POFD", "FAR", "CSI", "ROCSS",
"CR", "AW", "AWN", "AWI", "WS", "WSS", "CR", "AW", "AWN", "WS",
"ES") "ES")
for (metric in metrics) for (metric in metrics)
......
...@@ -17,7 +17,7 @@ all_metrics = c( ...@@ -17,7 +17,7 @@ all_metrics = c(
# 'RANK_HIST', 'DS', 'AS', # 'RANK_HIST', 'DS', 'AS',
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# intervals # intervals
'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS' 'CR', 'AW', 'AWN', 'WS'
) )
# load some predicted and observed streamflow # load some predicted and observed streamflow
......
...@@ -274,23 +274,11 @@ exp = list( ...@@ -274,23 +274,11 @@ exp = list(
), ),
dim=c(1,1,1,1,2) dim=c(1,1,1,1,2)
), ),
AWI = array(
data=unlist(
read.csv("./expected/evalp/AWI.csv", header=FALSE, colClasses="numeric")
),
dim=c(1,1,1,1,2)
),
WS = array( WS = array(
data=unlist( data=unlist(
read.csv("./expected/evalp/WS.csv", header=FALSE, colClasses="numeric") read.csv("./expected/evalp/WS.csv", header=FALSE, colClasses="numeric")
), ),
dim=c(1,1,1,1,2) dim=c(1,1,1,1,2)
),
WSS = array(
data=unlist(
read.csv("./expected/evalp/WSS.csv", header=FALSE, colClasses="numeric")
),
dim=c(1,1,1,1,2)
) )
) )
......
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