From c187457c602f27aed7139bee12aeb89841a35bff Mon Sep 17 00:00:00 2001 From: Thibault Hallouin <thibault.hallouin@inrae.fr> Date: Fri, 10 Feb 2023 18:06:37 +0100 Subject: [PATCH] include redefinition of "low flow events" (<= instead of <) which required to update to the latest evalhyd commit and adjust the expected output for contingency table-based metrics --- deps/evalhyd | 2 +- tests/test_probabilist.py | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deps/evalhyd b/deps/evalhyd index c7a39af..55a8aac 160000 --- a/deps/evalhyd +++ b/deps/evalhyd @@ -1 +1 @@ -Subproject commit c7a39afa56f78cc64ea58c0502bdd74de53a0941 +Subproject commit 55a8aac4d8c36ebfd13a4163973b46cccf6905e7 diff --git a/tests/test_probabilist.py b/tests/test_probabilist.py index 523a226..794acd9 100644 --- a/tests/test_probabilist.py +++ b/tests/test_probabilist.py @@ -55,11 +55,11 @@ class TestMetrics(unittest.TestCase): expected_ct = { 'POD': [[[[[[1.00000000, 1.00000000, 1.00000000, numpy.nan], - [0.86330935, 0.85436893, 0.75294118, numpy.nan], - [0.86330935, 0.85436893, 0.75294118, numpy.nan], - [0.86330935, 0.85436893, 0.75294118, numpy.nan], - [0.86330935, 0.85436893, 0.75294118, numpy.nan], - [0.86330935, 0.85436893, 0.75294118, numpy.nan]]]]]], + [0.86330935, 0.87378641, 0.75294118, numpy.nan], + [0.86330935, 0.87378641, 0.75294118, numpy.nan], + [0.86330935, 0.87378641, 0.75294118, numpy.nan], + [0.86330935, 0.87378641, 0.75294118, numpy.nan], + [0.86330935, 0.87378641, 0.75294118, numpy.nan]]]]]], 'POFD': [[[[[[1.00000000, 1.00000000, 1.00000000, numpy.nan], [0.08720930, 0.03846154, 0.02654867, numpy.nan], [0.08720930, 0.03846154, 0.02654867, numpy.nan], @@ -67,18 +67,18 @@ class TestMetrics(unittest.TestCase): [0.08720930, 0.03846154, 0.02654867, numpy.nan], [0.08139535, 0.03846154, 0.02654867, numpy.nan]]]]]], 'FAR': [[[[[[0.55305466, 0.66881029, 0.72668810, numpy.nan], - [0.11111111, 0.08333333, 0.08571429, numpy.nan], - [0.11111111, 0.08333333, 0.08571429, numpy.nan], - [0.11111111, 0.08333333, 0.08571429, numpy.nan], - [0.11111111, 0.08333333, 0.08571429, numpy.nan], - [0.10447761, 0.08333333, 0.08571429, numpy.nan]]]]]], + [0.11111111, 0.08163265, 0.08571429, numpy.nan], + [0.11111111, 0.08163265, 0.08571429, numpy.nan], + [0.11111111, 0.08163265, 0.08571429, numpy.nan], + [0.11111111, 0.08163265, 0.08571429, numpy.nan], + [0.10447761, 0.08163265, 0.08571429, numpy.nan]]]]]], 'CSI': [[[[[[0.44694534, 0.33118971, 0.27331190, numpy.nan], - [0.77922078, 0.79279279, 0.70329670, numpy.nan], - [0.77922078, 0.79279279, 0.70329670, numpy.nan], - [0.77922078, 0.79279279, 0.70329670, numpy.nan], - [0.77922078, 0.79279279, 0.70329670, numpy.nan], - [0.78431373, 0.79279279, 0.70329670, numpy.nan]]]]]], - 'ROCSS': [[[[[0.71084992, 0.78304705, 0.70640292, numpy.nan]]]]] + [0.77922078, 0.81081081, 0.70329670, numpy.nan], + [0.77922078, 0.81081081, 0.70329670, numpy.nan], + [0.77922078, 0.81081081, 0.70329670, numpy.nan], + [0.77922078, 0.81081081, 0.70329670, numpy.nan], + [0.78431373, 0.81081081, 0.70329670, numpy.nan]]]]]], + 'ROCSS': [[[[[0.71084992, 0.80171770, 0.70640292, numpy.nan]]]]] } expected_rk = { -- GitLab