From 4410a74f06f20646b1bd628a793737f54183c414 Mon Sep 17 00:00:00 2001
From: Thibault Hallouin <thibault.hallouin@inrae.fr>
Date: Tue, 7 Feb 2023 09:38:24 +0100
Subject: [PATCH] harmonise definitions for above/below threshold events
Low flow events were defined as the complement of high flow events,
meaning that Brier scores were symmetric. But it is more consistent to
include the threshold value in both the definitions of low flow and
high flow events since we either study one or the other, and rarely
both at the same time, especially not using the same threshold values.
Plus, the choice of including the threshold in high flow events rather
than low flow ones was really arbitrary.
Note, only the unit tests for contingency table-based metrics are
impacted because threshold-based metrics are using evants="high".
---
include/evalhyd/detail/probabilist/brier.hpp | 4 +-
tests/test_probabilist.cpp | 418 +++++++++----------
2 files changed, 211 insertions(+), 211 deletions(-)
diff --git a/include/evalhyd/detail/probabilist/brier.hpp b/include/evalhyd/detail/probabilist/brier.hpp
index 51554ad..831f56e 100644
--- a/include/evalhyd/detail/probabilist/brier.hpp
+++ b/include/evalhyd/detail/probabilist/brier.hpp
@@ -55,7 +55,7 @@ namespace evalhyd
{
// observations below threshold(s)
return xt::view(q_obs, xt::all(), xt::newaxis(), xt::all())
- < xt::view(q_thr, xt::all(), xt::all(), xt::newaxis());
+ <= xt::view(q_thr, xt::all(), xt::all(), xt::newaxis());
}
}
@@ -162,7 +162,7 @@ namespace evalhyd
// determine if members are below threshold(s)
auto f_k = xt::view(q_prd, xt::all(), xt::all(),
xt::newaxis(), xt::all(), xt::all())
- < xt::view(q_thr, xt::all(), xt::newaxis(),
+ <= xt::view(q_thr, xt::all(), xt::newaxis(),
xt::all(), xt::newaxis(), xt::newaxis());
// calculate how many members are below threshold(s)
diff --git a/tests/test_probabilist.cpp b/tests/test_probabilist.cpp
index 96f3546..66936f3 100644
--- a/tests/test_probabilist.cpp
+++ b/tests/test_probabilist.cpp
@@ -169,232 +169,232 @@ TEST(ProbabilistTests, TestContingency)
// check results
// POD
xt::xtensor<double, 6> pod =
- {{{{{{ 1. , 1. , 1. , NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.863309, 0.854369, 0.752941, NAN},
- { 0.848921, 0.854369, 0.752941, NAN},
- { 0.848921, 0.854369, 0.752941, NAN},
- { 0.848921, 0.84466 , 0.752941, NAN}}}}}};
+ {{{{{{ 1. , 1. , 1. , NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.863309, 0.873786, 0.752941, NAN},
+ { 0.848921, 0.873786, 0.752941, NAN},
+ { 0.848921, 0.873786, 0.752941, NAN},
+ { 0.848921, 0.864078, 0.752941, NAN}}}}}};
EXPECT_TRUE(
xt::all(xt::isclose(metrics[0], pod, 1e-05, 1e-08, true))
);
// POFD
xt::xtensor<double, 6> pofd =
- {{{{{{ 1. , 1. , 1. , NAN},
- { 0.087209, 0.038462, 0.026549, NAN},
- { 0.087209, 0.038462, 0.026549, NAN},
- { 0.087209, 0.038462, 0.026549, NAN},
- { 0.087209, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.026549, NAN},
- { 0.081395, 0.038462, 0.022124, NAN}}}}}};
+ {{{{{{ 1. , 1. , 1. , NAN},
+ { 0.087209, 0.038462, 0.026549, NAN},
+ { 0.087209, 0.038462, 0.026549, NAN},
+ { 0.087209, 0.038462, 0.026549, NAN},
+ { 0.087209, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.026549, NAN},
+ { 0.081395, 0.038462, 0.022124, NAN}}}}}};
EXPECT_TRUE(
xt::all(xt::isclose(metrics[1], pofd, 1e-04, 1e-07, true))
);
// FAR
xt::xtensor<double, 6> far =
- {{{{{{ 0.553055, 0.66881 , 0.726688, NAN},
- { 0.111111, 0.083333, 0.085714, NAN},
- { 0.111111, 0.083333, 0.085714, NAN},
- { 0.111111, 0.083333, 0.085714, NAN},
- { 0.111111, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.104478, 0.083333, 0.085714, NAN},
- { 0.106061, 0.083333, 0.085714, NAN},
- { 0.106061, 0.083333, 0.085714, NAN},
- { 0.106061, 0.084211, 0.072464, NAN}}}}}};
+ {{{{{{ 0.553055, 0.66881 , 0.726688, NAN},
+ { 0.111111, 0.081633, 0.085714, NAN},
+ { 0.111111, 0.081633, 0.085714, NAN},
+ { 0.111111, 0.081633, 0.085714, NAN},
+ { 0.111111, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.104478, 0.081633, 0.085714, NAN},
+ { 0.106061, 0.081633, 0.085714, NAN},
+ { 0.106061, 0.081633, 0.085714, NAN},
+ { 0.106061, 0.082474, 0.072464, NAN}}}}}};
EXPECT_TRUE(
xt::all(xt::isclose(metrics[2], far, 1e-05, 1e-08, true))
);
// CSI
xt::xtensor<double, 6> csi =
- {{{{{{ 0.446945, 0.33119 , 0.273312, NAN},
- { 0.779221, 0.792793, 0.703297, NAN},
- { 0.779221, 0.792793, 0.703297, NAN},
- { 0.779221, 0.792793, 0.703297, NAN},
- { 0.779221, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.784314, 0.792793, 0.703297, NAN},
- { 0.771242, 0.792793, 0.703297, NAN},
- { 0.771242, 0.792793, 0.703297, NAN},
- { 0.771242, 0.783784, 0.711111, NAN}}}}}}
+ {{{{{{ 0.446945, 0.33119 , 0.273312, NAN},
+ { 0.779221, 0.810811, 0.703297, NAN},
+ { 0.779221, 0.810811, 0.703297, NAN},
+ { 0.779221, 0.810811, 0.703297, NAN},
+ { 0.779221, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.784314, 0.810811, 0.703297, NAN},
+ { 0.771242, 0.810811, 0.703297, NAN},
+ { 0.771242, 0.810811, 0.703297, NAN},
+ { 0.771242, 0.801802, 0.711111, NAN}}}}}}
;
EXPECT_TRUE(
xt::all(xt::isclose(metrics[3], csi, 1e-05, 1e-08, true))
@@ -402,7 +402,7 @@ TEST(ProbabilistTests, TestContingency)
// ROC skill scores
xt::xtensor<double, 5> rocss =
- {{{{{ 0.71085 , 0.783047, 0.713066, NAN}}}}};
+ {{{{{ 0.710850, 0.801718, 0.713066, NAN}}}}};
EXPECT_TRUE(
xt::all(xt::isclose(metrics[4], rocss, 1e-05, 1e-08, true))
);
--
GitLab