diff --git a/tests/expected/evalp/REL_DIAG.csv b/tests/expected/evalp/REL_DIAG.csv new file mode 100644 index 0000000000000000000000000000000000000000..3568332be044fda594e68d46f3c9ac93bfad0af4 --- /dev/null +++ b/tests/expected/evalp/REL_DIAG.csv @@ -0,0 +1,208 @@ +0.0000000000000,0.1060606060606,132.0000000000000 +0.0196078431373,0.0000000000000,0.0000000000000 +0.0392156862745,0.0000000000000,0.0000000000000 +0.0588235294118,0.0000000000000,2.0000000000000 +0.0784313725490,0.0000000000000,0.0000000000000 +0.0980392156863,0.0000000000000,0.0000000000000 +0.1176470588235,0.0000000000000,0.0000000000000 +0.1372549019608,0.0000000000000,0.0000000000000 +0.1568627450980,0.0000000000000,0.0000000000000 +0.1764705882353,0.0000000000000,0.0000000000000 +0.1960784313725,0.0000000000000,0.0000000000000 +0.2156862745098,0.0000000000000,0.0000000000000 +0.2352941176471,0.0000000000000,0.0000000000000 +0.2549019607843,0.0000000000000,0.0000000000000 +0.2745098039216,0.0000000000000,0.0000000000000 +0.2941176470588,0.0000000000000,0.0000000000000 +0.3137254901961,0.0000000000000,0.0000000000000 +0.3333333333333,0.0000000000000,0.0000000000000 +0.3529411764706,0.0000000000000,0.0000000000000 +0.3725490196078,0.0000000000000,0.0000000000000 +0.3921568627451,0.0000000000000,0.0000000000000 +0.4117647058824,0.0000000000000,0.0000000000000 +0.4313725490196,0.0000000000000,0.0000000000000 +0.4509803921569,0.0000000000000,0.0000000000000 +0.4705882352941,0.0000000000000,0.0000000000000 +0.4901960784314,0.0000000000000,0.0000000000000 +0.5098039215686,0.0000000000000,0.0000000000000 +0.5294117647059,0.0000000000000,0.0000000000000 +0.5490196078431,0.0000000000000,0.0000000000000 +0.5686274509804,0.0000000000000,0.0000000000000 +0.5882352941176,0.0000000000000,0.0000000000000 +0.6078431372549,0.0000000000000,0.0000000000000 +0.6274509803922,0.0000000000000,0.0000000000000 +0.6470588235294,0.0000000000000,0.0000000000000 +0.6666666666667,0.0000000000000,0.0000000000000 +0.6862745098039,0.0000000000000,0.0000000000000 +0.7058823529412,0.0000000000000,0.0000000000000 +0.7254901960784,0.0000000000000,0.0000000000000 +0.7450980392157,0.0000000000000,0.0000000000000 +0.7647058823529,0.0000000000000,0.0000000000000 +0.7843137254902,0.0000000000000,0.0000000000000 +0.8039215686275,0.0000000000000,0.0000000000000 +0.8235294117647,0.0000000000000,0.0000000000000 +0.8431372549020,0.0000000000000,0.0000000000000 +0.8627450980392,0.0000000000000,0.0000000000000 +0.8823529411765,0.0000000000000,0.0000000000000 +0.9019607843137,0.0000000000000,0.0000000000000 +0.9215686274510,1.0000000000000,1.0000000000000 +0.9411764705882,0.0000000000000,0.0000000000000 +0.9607843137255,0.0000000000000,0.0000000000000 +0.9803921568627,0.0000000000000,0.0000000000000 +1.0000000000000,0.8920454545455,176.0000000000000 +0.0000000000000,0.0842105263158,95.0000000000000 +0.0196078431373,0.0000000000000,1.0000000000000 +0.0392156862745,0.0000000000000,0.0000000000000 +0.0588235294118,0.0000000000000,0.0000000000000 +0.0784313725490,0.0000000000000,0.0000000000000 +0.0980392156863,0.0000000000000,0.0000000000000 +0.1176470588235,0.0000000000000,0.0000000000000 +0.1372549019608,0.0000000000000,0.0000000000000 +0.1568627450980,0.0000000000000,0.0000000000000 +0.1764705882353,0.0000000000000,0.0000000000000 +0.1960784313725,0.0000000000000,0.0000000000000 +0.2156862745098,0.0000000000000,0.0000000000000 +0.2352941176471,0.0000000000000,0.0000000000000 +0.2549019607843,0.0000000000000,0.0000000000000 +0.2745098039216,0.0000000000000,0.0000000000000 +0.2941176470588,0.0000000000000,0.0000000000000 +0.3137254901961,0.0000000000000,0.0000000000000 +0.3333333333333,0.0000000000000,0.0000000000000 +0.3529411764706,0.0000000000000,0.0000000000000 +0.3725490196078,0.0000000000000,0.0000000000000 +0.3921568627451,0.0000000000000,0.0000000000000 +0.4117647058824,0.0000000000000,0.0000000000000 +0.4313725490196,0.0000000000000,0.0000000000000 +0.4509803921569,0.0000000000000,0.0000000000000 +0.4705882352941,0.0000000000000,0.0000000000000 +0.4901960784314,0.0000000000000,0.0000000000000 +0.5098039215686,0.0000000000000,0.0000000000000 +0.5294117647059,0.0000000000000,0.0000000000000 +0.5490196078431,0.0000000000000,0.0000000000000 +0.5686274509804,0.0000000000000,0.0000000000000 +0.5882352941176,0.0000000000000,0.0000000000000 +0.6078431372549,0.0000000000000,0.0000000000000 +0.6274509803922,0.0000000000000,0.0000000000000 +0.6470588235294,0.0000000000000,0.0000000000000 +0.6666666666667,0.0000000000000,0.0000000000000 +0.6862745098039,0.0000000000000,0.0000000000000 +0.7058823529412,0.0000000000000,0.0000000000000 +0.7254901960784,0.0000000000000,0.0000000000000 +0.7450980392157,0.0000000000000,0.0000000000000 +0.7647058823529,0.0000000000000,0.0000000000000 +0.7843137254902,0.0000000000000,0.0000000000000 +0.8039215686275,0.0000000000000,0.0000000000000 +0.8235294117647,0.0000000000000,0.0000000000000 +0.8431372549020,0.0000000000000,0.0000000000000 +0.8627450980392,0.0000000000000,0.0000000000000 +0.8823529411765,0.0000000000000,0.0000000000000 +0.9019607843137,0.0000000000000,0.0000000000000 +0.9215686274510,0.0000000000000,0.0000000000000 +0.9411764705882,0.0000000000000,0.0000000000000 +0.9607843137255,0.0000000000000,0.0000000000000 +0.9803921568627,0.0000000000000,0.0000000000000 +1.0000000000000,0.9302325581395,215.0000000000000 +0.0000000000000,0.0724637681159,69.0000000000000 +0.0196078431373,1.0000000000000,1.0000000000000 +0.0392156862745,0.0000000000000,0.0000000000000 +0.0588235294118,0.0000000000000,0.0000000000000 +0.0784313725490,0.0000000000000,0.0000000000000 +0.0980392156863,0.0000000000000,0.0000000000000 +0.1176470588235,0.0000000000000,0.0000000000000 +0.1372549019608,0.0000000000000,0.0000000000000 +0.1568627450980,0.0000000000000,0.0000000000000 +0.1764705882353,0.0000000000000,0.0000000000000 +0.1960784313725,0.0000000000000,0.0000000000000 +0.2156862745098,0.0000000000000,0.0000000000000 +0.2352941176471,0.0000000000000,0.0000000000000 +0.2549019607843,0.0000000000000,0.0000000000000 +0.2745098039216,0.0000000000000,0.0000000000000 +0.2941176470588,0.0000000000000,0.0000000000000 +0.3137254901961,0.0000000000000,0.0000000000000 +0.3333333333333,0.0000000000000,0.0000000000000 +0.3529411764706,0.0000000000000,0.0000000000000 +0.3725490196078,0.0000000000000,0.0000000000000 +0.3921568627451,0.0000000000000,0.0000000000000 +0.4117647058824,0.0000000000000,0.0000000000000 +0.4313725490196,0.0000000000000,0.0000000000000 +0.4509803921569,0.0000000000000,0.0000000000000 +0.4705882352941,0.0000000000000,0.0000000000000 +0.4901960784314,0.0000000000000,0.0000000000000 +0.5098039215686,0.0000000000000,0.0000000000000 +0.5294117647059,0.0000000000000,0.0000000000000 +0.5490196078431,0.0000000000000,0.0000000000000 +0.5686274509804,0.0000000000000,0.0000000000000 +0.5882352941176,0.0000000000000,0.0000000000000 +0.6078431372549,0.0000000000000,0.0000000000000 +0.6274509803922,0.0000000000000,0.0000000000000 +0.6470588235294,0.0000000000000,0.0000000000000 +0.6666666666667,0.0000000000000,0.0000000000000 +0.6862745098039,0.0000000000000,0.0000000000000 +0.7058823529412,0.0000000000000,0.0000000000000 +0.7254901960784,0.0000000000000,0.0000000000000 +0.7450980392157,0.0000000000000,0.0000000000000 +0.7647058823529,0.0000000000000,0.0000000000000 +0.7843137254902,0.0000000000000,0.0000000000000 +0.8039215686275,0.0000000000000,0.0000000000000 +0.8235294117647,0.0000000000000,0.0000000000000 +0.8431372549020,0.0000000000000,0.0000000000000 +0.8627450980392,0.0000000000000,0.0000000000000 +0.8823529411765,0.0000000000000,0.0000000000000 +0.9019607843137,0.0000000000000,0.0000000000000 +0.9215686274510,0.0000000000000,0.0000000000000 +0.9411764705882,0.0000000000000,0.0000000000000 +0.9607843137255,0.0000000000000,0.0000000000000 +0.9803921568627,0.0000000000000,0.0000000000000 +1.0000000000000,0.9128630705394,241.0000000000000 +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan +nan,nan,nan diff --git a/tests/test_probabilist.cpp b/tests/test_probabilist.cpp index 165b0df316f144992cc33ee4bb40e32ab0fbf512..5bd3f49863b79ef3e1b2ad6793d52e25059844cb 100644 --- a/tests/test_probabilist.cpp +++ b/tests/test_probabilist.cpp @@ -30,7 +30,7 @@ using namespace xt::placeholders; // required for `_` to work std::vector<std::string> all_metrics_p = { - "BS", "BSS", "BS_CRD", "BS_LBD", + "BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG", "QS", "CRPS", "POD", "POFD", "FAR", "CSI", "ROCSS", "RANK_HIST", "DS", "AS", @@ -84,7 +84,7 @@ TEST(ProbabilistTests, TestBrier) // compute scores xt::xtensor<double, 2> thresholds = {{690, 534, 445, NAN}}; - std::vector<std::string> metrics = {"BS", "BSS", "BS_CRD", "BS_LBD"}; + std::vector<std::string> metrics = {"BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG"}; std::vector<xt::xarray<double>> results = evalhyd::evalp( @@ -100,6 +100,16 @@ TEST(ProbabilistTests, TestBrier) // check results for (std::size_t m = 0; m < metrics.size(); m++) { + if ( metrics[m] == "REL_DIAG" ) + { + // /!\ stacked-up thresholds in CSV file because 7D metric, + // so need to resize array + expected[metrics[m]].resize( + {std::size_t {1}, std::size_t {1}, std::size_t {1}, + std::size_t {1}, thresholds.shape(1), + predicted.shape(0) + 1, std::size_t {3}} + ); + } EXPECT_TRUE(xt::all(xt::isclose( results[m], expected[metrics[m]], 1e-05, 1e-08, true ))) << "Failure for (" << metrics[m] << ")";