From f54267350d16beecbd2571f514c0b9065a7921bc Mon Sep 17 00:00:00 2001
From: fbourgin <francois.bourgin@inrae.fr>
Date: Thu, 24 Apr 2025 15:00:53 +0200
Subject: [PATCH] wip - debug
---
include/evalhyd/detail/probabilist/intervals.hpp | 9 ---------
tests/expected/evalp/CR_QLVL.csv | 1 +
tests/test_probabilist.cpp | 8 +++++---
3 files changed, 6 insertions(+), 12 deletions(-)
create mode 100644 tests/expected/evalp/CR_QLVL.csv
diff --git a/include/evalhyd/detail/probabilist/intervals.hpp b/include/evalhyd/detail/probabilist/intervals.hpp
index 3bfe578..f52fd5a 100644
--- a/include/evalhyd/detail/probabilist/intervals.hpp
+++ b/include/evalhyd/detail/probabilist/intervals.hpp
@@ -69,15 +69,6 @@ namespace evalhyd
auto a = xt::broadcast(xt::view(quantiles, i), std::vector<std::size_t>({q_lvl.size(), 2}));
auto b = xt::broadcast(q_lvl / 100., std::vector<std::size_t>({2, q_lvl.size()}));
auto res = xt::where(xt::equal(a, xt::transpose(b)));
-
- std::cout << "res: " << res.size() << std::endl;
- std::cout << "res_00: " << res[0][0] << std::endl;
- std::cout << "res_01: " << res[0][1] << std::endl;
- std::cout << "res_10: " << res[1][0] << std::endl;
- std::cout << "res_11: " << res[1][1] << std::endl;
-
- std::cout << "res_min: " << std::min(res[0][0], res[0][1]) << std::endl;
- std::cout << "res_max: " << std::max(res[0][0], res[0][1]) << std::endl;
if (res.size() != 2)
{
diff --git a/tests/expected/evalp/CR_QLVL.csv b/tests/expected/evalp/CR_QLVL.csv
new file mode 100644
index 0000000..a4a7469
--- /dev/null
+++ b/tests/expected/evalp/CR_QLVL.csv
@@ -0,0 +1 @@
+0.0064308681672,0.0353697749196
diff --git a/tests/test_probabilist.cpp b/tests/test_probabilist.cpp
index 4cea2a8..efe0ba1 100644
--- a/tests/test_probabilist.cpp
+++ b/tests/test_probabilist.cpp
@@ -36,7 +36,8 @@ std::vector<std::string> all_metrics_p = {
"CONT_TBL", "POD", "POFD", "FAR", "CSI", "ROCSS",
"RANK_HIST", "DS", "AS",
"CR", "AW", "AWN", "WS",
- "ES"
+ "ES",
+ "CR_QLVL"
};
std::tuple<xt::xtensor<double, 1>, xt::xtensor<double, 2>> load_data_p()
@@ -309,13 +310,14 @@ TEST(ProbabilistTests, TestIntervalsQLVL)
// compute scores
std::vector<std::string> metrics = {"CR"};
+ std::vector<std::string> metrics_ = {"CR_QLVL"};
std::vector<xt::xarray<double>> results =
evalhyd::evalp(
// shape: (sites [1], time [t])
xt::eval(xt::view(observed, xt::newaxis(), xt::all())),
// shape: (sites [1], lead times [1], members [m], time [t])
- xt::eval(xt::view(predicted, xt::newaxis(), xt::newaxis(), xt::range(0, 4), xt::all())),
+ xt::eval(xt::view(predicted, xt::newaxis(), xt::newaxis(), xt::keep(0, 15, 30, 50), xt::all())),
metrics,
xt::xtensor<double, 2>({}),
"", // events
@@ -327,7 +329,7 @@ TEST(ProbabilistTests, TestIntervalsQLVL)
for (std::size_t m = 0; m < metrics.size(); m++)
{
EXPECT_TRUE(xt::all(xt::isclose(
- results[m], expected[metrics[m]], 1e-05, 1e-08, true
+ results[m], expected[metrics_[m]], 1e-05, 1e-08, true
))) << "Failure for (" << metrics[m] << ")";
}
}
--
GitLab