From bb0b67fd4c9adc5945a5857f29bd09d256451bf4 Mon Sep 17 00:00:00 2001
From: fbourgin <francois.bourgin@inrae.fr>
Date: Thu, 15 Jun 2023 18:36:57 +0200
Subject: [PATCH] update evalhyd-cpp and remove WSS and AWI from tests
---
deps/evalhyd-cpp | 2 +-
tests/testthat/expected/evalp/AWI.csv | 1 -
tests/testthat/expected/evalp/WSS.csv | 1 -
tests/testthat/test-probabilist-bootstrapping.R | 2 +-
tests/testthat/test-probabilist-missing-data.R | 2 +-
tests/testthat/test-probabilist-multi-dimensional.R | 2 +-
tests/testthat/test-probabilist.R | 12 ------------
7 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 tests/testthat/expected/evalp/AWI.csv
delete mode 100644 tests/testthat/expected/evalp/WSS.csv
diff --git a/deps/evalhyd-cpp b/deps/evalhyd-cpp
index a8c62cd..805e4a6 160000
--- a/deps/evalhyd-cpp
+++ b/deps/evalhyd-cpp
@@ -1 +1 @@
-Subproject commit a8c62cd26901feb3ff1d745a24569a3814d0f023
+Subproject commit 805e4a6af9271dec04e55417d7539b7c09841f40
diff --git a/tests/testthat/expected/evalp/AWI.csv b/tests/testthat/expected/evalp/AWI.csv
deleted file mode 100644
index 8b3b7e7..0000000
--- a/tests/testthat/expected/evalp/AWI.csv
+++ /dev/null
@@ -1 +0,0 @@
-0.9821120161733,0.9880951944476
diff --git a/tests/testthat/expected/evalp/WSS.csv b/tests/testthat/expected/evalp/WSS.csv
deleted file mode 100644
index fd929da..0000000
--- a/tests/testthat/expected/evalp/WSS.csv
+++ /dev/null
@@ -1 +0,0 @@
-0.6621887740287,0.4360388849930
diff --git a/tests/testthat/test-probabilist-bootstrapping.R b/tests/testthat/test-probabilist-bootstrapping.R
index 8198deb..013b365 100644
--- a/tests/testthat/test-probabilist-bootstrapping.R
+++ b/tests/testthat/test-probabilist-bootstrapping.R
@@ -17,7 +17,7 @@ all_metrics = c(
# 'RANK_HIST', 'DS', 'AS',
# ------------------------------------------------------------------------------
# intervals
- 'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS',
+ 'CR', 'AW', 'AWN', 'WS',
# multivariate
'ES'
)
diff --git a/tests/testthat/test-probabilist-missing-data.R b/tests/testthat/test-probabilist-missing-data.R
index 19c6fb9..75ce237 100644
--- a/tests/testthat/test-probabilist-missing-data.R
+++ b/tests/testthat/test-probabilist-missing-data.R
@@ -40,7 +40,7 @@ metrics = c("BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG", "CRPS_FROM_BS",
"CRPS_FROM_ECDF",
"QS", "CRPS_FROM_QS",
"POD", "POFD", "FAR", "CSI", "ROCSS",
- "CR", "AW", "AWN", "AWI", "WS", "WSS",
+ "CR", "AW", "AWN", "WS",
"ES")
for (metric in metrics)
diff --git a/tests/testthat/test-probabilist-multi-dimensional.R b/tests/testthat/test-probabilist-multi-dimensional.R
index d600090..b011579 100644
--- a/tests/testthat/test-probabilist-multi-dimensional.R
+++ b/tests/testthat/test-probabilist-multi-dimensional.R
@@ -17,7 +17,7 @@ all_metrics = c(
# 'RANK_HIST', 'DS', 'AS',
# ------------------------------------------------------------------------------
# intervals
- 'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS'
+ 'CR', 'AW', 'AWN', 'WS'
)
# load some predicted and observed streamflow
diff --git a/tests/testthat/test-probabilist.R b/tests/testthat/test-probabilist.R
index 3298c6f..81b1a29 100644
--- a/tests/testthat/test-probabilist.R
+++ b/tests/testthat/test-probabilist.R
@@ -274,23 +274,11 @@ exp = list(
),
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(
data=unlist(
read.csv("./expected/evalp/WS.csv", header=FALSE, colClasses="numeric")
),
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)
)
)
--
GitLab