Commit 8cec54a3 authored by Thibault Hallouin's avatar Thibault Hallouin
Browse files

fix type mismatch for loop on integer type

Showing with 14 additions and 14 deletions
+14 -14
...@@ -162,7 +162,7 @@ TEST(DeterministTests, TestMasks) ...@@ -162,7 +162,7 @@ TEST(DeterministTests, TestMasks)
evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(obs, prd, metrics); evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(obs, prd, metrics);
// check results are identical // 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])) EXPECT_TRUE(xt::allclose(metrics_masked[m], metrics_subset[m]))
<< "Failure for (" << metrics[m] << ")"; << "Failure for (" << metrics[m] << ")";
...@@ -204,7 +204,7 @@ TEST(DeterministTests, TestMaskingConditions) ...@@ -204,7 +204,7 @@ TEST(DeterministTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -237,7 +237,7 @@ TEST(DeterministTests, TestMaskingConditions) ...@@ -237,7 +237,7 @@ TEST(DeterministTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -268,7 +268,7 @@ TEST(DeterministTests, TestMaskingConditions) ...@@ -268,7 +268,7 @@ TEST(DeterministTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -301,8 +301,8 @@ TEST(DeterministTests, TestMissingData) ...@@ -301,8 +301,8 @@ TEST(DeterministTests, TestMissingData)
std::vector<xt::xarray<double>> metrics_nan = std::vector<xt::xarray<double>> metrics_nan =
evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(observed, predicted, metrics); evalhyd::evald<xt::xtensor<double, 2>, xt::xtensor<bool, 2>>(observed, predicted, metrics);
for (int m = 0; m < metrics.size(); m++) { for (std::size_t m = 0; m < metrics.size(); m++) {
for (int p = 0; p < predicted.shape(0); p++) { for (std::size_t p = 0; p < predicted.shape(0); p++) {
// compute metrics on subset of observations and predictions (i.e. // compute metrics on subset of observations and predictions (i.e.
// eliminating region with NaN in observations or predictions manually) // eliminating region with NaN in observations or predictions manually)
xt::xtensor<double, 1> obs = xt::xtensor<double, 1> obs =
...@@ -386,7 +386,7 @@ TEST(DeterministTests, TestBootstrap) ...@@ -386,7 +386,7 @@ TEST(DeterministTests, TestBootstrap)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
......
...@@ -173,7 +173,7 @@ TEST(ProbabilistTests, TestMasks) ...@@ -173,7 +173,7 @@ TEST(ProbabilistTests, TestMasks)
); );
// check results are identical // 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])) EXPECT_TRUE(xt::allclose(metrics_masked[m], metrics_subset[m]))
<< "Failure for (" << metrics[m] << ")"; << "Failure for (" << metrics[m] << ")";
...@@ -224,7 +224,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ...@@ -224,7 +224,7 @@ TEST(ProbabilistTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -263,7 +263,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ...@@ -263,7 +263,7 @@ TEST(ProbabilistTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -299,7 +299,7 @@ TEST(ProbabilistTests, TestMaskingConditions) ...@@ -299,7 +299,7 @@ TEST(ProbabilistTests, TestMaskingConditions)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -377,7 +377,7 @@ TEST(ProbabilistTests, TestMissingData) ...@@ -377,7 +377,7 @@ TEST(ProbabilistTests, TestMissingData)
); );
// check that numerical results are identical // 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 // for leadtime 1
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
...@@ -455,7 +455,7 @@ TEST(ProbabilistTests, TestBootstrap) ...@@ -455,7 +455,7 @@ TEST(ProbabilistTests, TestBootstrap)
); );
// check results are identical // check results are identical
for (int m = 0; m < metrics.size(); m++) for (std::size_t m = 0; m < metrics.size(); m++)
{ {
EXPECT_TRUE( EXPECT_TRUE(
xt::allclose( xt::allclose(
......
...@@ -54,7 +54,7 @@ TEST(UncertaintyTests, TestBootstrapGenerator) ...@@ -54,7 +54,7 @@ TEST(UncertaintyTests, TestBootstrapGenerator)
}; };
// check that sampled indices are as expected by applying them on some data // 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()); auto data = xt::arange(datetimes.size());
EXPECT_TRUE( EXPECT_TRUE(
......
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