From 8cec54a34451713e2fc4bf490d54c2f55db118ac Mon Sep 17 00:00:00 2001 From: Thibault Hallouin <thibault.hallouin@inrae.fr> Date: Tue, 27 Dec 2022 12:08:10 +0100 Subject: [PATCH] fix type mismatch for loop on integer type --- tests/test_determinist.cpp | 14 +++++++------- tests/test_probabilist.cpp | 12 ++++++------ tests/test_uncertainty.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_determinist.cpp b/tests/test_determinist.cpp index eab5294..5239076 100644 --- a/tests/test_determinist.cpp +++ b/tests/test_determinist.cpp @@ -162,7 +162,7 @@ TEST(DeterministTests, TestMasks) evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(obs, prd, metrics); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE(xt::allclose(metrics_masked[m], metrics_subset[m])) << "Failure for (" << metrics[m] << ")"; @@ -204,7 +204,7 @@ TEST(DeterministTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -237,7 +237,7 @@ TEST(DeterministTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -268,7 +268,7 @@ TEST(DeterministTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -301,8 +301,8 @@ TEST(DeterministTests, TestMissingData) std::vector<xt::xarray<double>> metrics_nan = evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(observed, predicted, metrics); - for (int m = 0; m < metrics.size(); m++) { - for (int p = 0; p < predicted.shape(0); p++) { + for (std::size_t m = 0; m < metrics.size(); m++) { + for (std::size_t p = 0; p < predicted.shape(0); p++) { // compute metrics on subset of observations and predictions (i.e. // eliminating region with NaN in observations or predictions manually) xt::xtensor<double, 1> obs = @@ -386,7 +386,7 @@ TEST(DeterministTests, TestBootstrap) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( diff --git a/tests/test_probabilist.cpp b/tests/test_probabilist.cpp index de5f2b4..c258b0c 100644 --- a/tests/test_probabilist.cpp +++ b/tests/test_probabilist.cpp @@ -173,7 +173,7 @@ TEST(ProbabilistTests, TestMasks) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE(xt::allclose(metrics_masked[m], metrics_subset[m])) << "Failure for (" << metrics[m] << ")"; @@ -224,7 +224,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -263,7 +263,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -299,7 +299,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( @@ -377,7 +377,7 @@ TEST(ProbabilistTests, TestMissingData) ); // check that numerical results are identical - for (int m = 0; m < metrics.size(); m++) { + for (std::size_t m = 0; m < metrics.size(); m++) { // for leadtime 1 EXPECT_TRUE( xt::allclose( @@ -455,7 +455,7 @@ TEST(ProbabilistTests, TestBootstrap) ); // check results are identical - for (int m = 0; m < metrics.size(); m++) + for (std::size_t m = 0; m < metrics.size(); m++) { EXPECT_TRUE( xt::allclose( diff --git a/tests/test_uncertainty.cpp b/tests/test_uncertainty.cpp index d87a972..5d5cbb1 100644 --- a/tests/test_uncertainty.cpp +++ b/tests/test_uncertainty.cpp @@ -54,7 +54,7 @@ TEST(UncertaintyTests, TestBootstrapGenerator) }; // check that sampled indices are as expected by applying them on some data - for (int s = 0; s < samples.size(); s++) + for (std::size_t s = 0; s < samples.size(); s++) { auto data = xt::arange(datetimes.size()); EXPECT_TRUE( -- GitLab