Commit f5426735 authored by fbourgin's avatar fbourgin
Browse files

wip - debug

parent 6efc5a88
1 merge request!9Resolve "evaluation of quantiles prediction"
Pipeline #63456 failed with stage
in 3 minutes and 40 seconds
Showing with 6 additions and 12 deletions
+6 -12
...@@ -69,15 +69,6 @@ namespace evalhyd ...@@ -69,15 +69,6 @@ namespace evalhyd
auto a = xt::broadcast(xt::view(quantiles, i), std::vector<std::size_t>({q_lvl.size(), 2})); 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 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))); 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) if (res.size() != 2)
{ {
......
0.0064308681672,0.0353697749196
...@@ -36,7 +36,8 @@ std::vector<std::string> all_metrics_p = { ...@@ -36,7 +36,8 @@ std::vector<std::string> all_metrics_p = {
"CONT_TBL", "POD", "POFD", "FAR", "CSI", "ROCSS", "CONT_TBL", "POD", "POFD", "FAR", "CSI", "ROCSS",
"RANK_HIST", "DS", "AS", "RANK_HIST", "DS", "AS",
"CR", "AW", "AWN", "WS", "CR", "AW", "AWN", "WS",
"ES" "ES",
"CR_QLVL"
}; };
std::tuple<xt::xtensor<double, 1>, xt::xtensor<double, 2>> load_data_p() std::tuple<xt::xtensor<double, 1>, xt::xtensor<double, 2>> load_data_p()
...@@ -309,13 +310,14 @@ TEST(ProbabilistTests, TestIntervalsQLVL) ...@@ -309,13 +310,14 @@ TEST(ProbabilistTests, TestIntervalsQLVL)
// compute scores // compute scores
std::vector<std::string> metrics = {"CR"}; std::vector<std::string> metrics = {"CR"};
std::vector<std::string> metrics_ = {"CR_QLVL"};
std::vector<xt::xarray<double>> results = std::vector<xt::xarray<double>> results =
evalhyd::evalp( evalhyd::evalp(
// shape: (sites [1], time [t]) // shape: (sites [1], time [t])
xt::eval(xt::view(observed, xt::newaxis(), xt::all())), xt::eval(xt::view(observed, xt::newaxis(), xt::all())),
// shape: (sites [1], lead times [1], members [m], time [t]) // 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, metrics,
xt::xtensor<double, 2>({}), xt::xtensor<double, 2>({}),
"", // events "", // events
...@@ -327,7 +329,7 @@ TEST(ProbabilistTests, TestIntervalsQLVL) ...@@ -327,7 +329,7 @@ TEST(ProbabilistTests, TestIntervalsQLVL)
for (std::size_t m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE(xt::all(xt::isclose( 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] << ")"; ))) << "Failure for (" << metrics[m] << ")";
} }
} }
......
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