From da78292bca97c8dcc080dc5fb2efb9486c4efd8a Mon Sep 17 00:00:00 2001
From: Thibault Hallouin <thibault.hallouin@inrae.fr>
Date: Thu, 1 Dec 2022 15:26:40 +0100
Subject: [PATCH] fix compilation bugs
---
include/evalhyd/evald.hpp | 2 +-
src/determinist/evald.cpp | 15 +++++++--------
src/probabilist/evalp.cpp | 11 +++++------
src/probabilist/evaluator_brier.cpp | 2 +-
src/probabilist/evaluator_elements.cpp | 2 +-
src/probabilist/evaluator_quantiles.cpp | 2 +-
6 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/include/evalhyd/evald.hpp b/include/evalhyd/evald.hpp
index 34a879f..45ff659 100644
--- a/include/evalhyd/evald.hpp
+++ b/include/evalhyd/evald.hpp
@@ -4,7 +4,7 @@
#include <unordered_map>
#include <vector>
-#include <xtensor/xexpression.hpp>
+#include <xtensor/xtensor.hpp>
#include <xtensor/xarray.hpp>
diff --git a/src/determinist/evald.cpp b/src/determinist/evald.cpp
index 92dfbc1..6735530 100644
--- a/src/determinist/evald.cpp
+++ b/src/determinist/evald.cpp
@@ -22,14 +22,13 @@ namespace evalhyd
const xt::xtensor<double, 2>& q_obs,
const xt::xtensor<double, 2>& q_prd,
const std::vector<std::string>& metrics,
- const std::string& transform = "none",
- const double exponent = 1,
- double epsilon = -9,
- const xt::xtensor<bool, 2>& t_msk = {},
- const xt::xtensor<std::array<char, 32>, 1>& m_cdt = {},
- const std::unordered_map<std::string, int>& bootstrap =
- {{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}},
- const std::vector<std::string>& dts = {}
+ const std::string& transform,
+ const double exponent,
+ double epsilon,
+ const xt::xtensor<bool, 2>& t_msk,
+ const xt::xtensor<std::array<char, 32>, 1>& m_cdt,
+ const std::unordered_map<std::string, int>& bootstrap,
+ const std::vector<std::string>& dts
)
{
// check that the metrics to be computed are valid
diff --git a/src/probabilist/evalp.cpp b/src/probabilist/evalp.cpp
index ee6c64d..3e0ae7f 100644
--- a/src/probabilist/evalp.cpp
+++ b/src/probabilist/evalp.cpp
@@ -22,12 +22,11 @@ namespace evalhyd
const xt::xtensor<double, 2>& q_obs,
const xt::xtensor<double, 4>& q_prd,
const std::vector<std::string>& metrics,
- const xt::xtensor<double, 2>& q_thr = {},
- const xt::xtensor<bool, 4>& t_msk = {},
- const xt::xtensor<std::array<char, 32>, 2>& m_cdt = {},
- const std::unordered_map<std::string, int>& bootstrap =
- {{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}},
- const std::vector<std::string>& dts = {}
+ const xt::xtensor<double, 2>& q_thr,
+ const xt::xtensor<bool, 4>& t_msk,
+ const xt::xtensor<std::array<char, 32>, 2>& m_cdt,
+ const std::unordered_map<std::string, int>& bootstrap,
+ const std::vector<std::string>& dts
)
{
// check that the metrics to be computed are valid
diff --git a/src/probabilist/evaluator_brier.cpp b/src/probabilist/evaluator_brier.cpp
index bbadf84..2528aef 100644
--- a/src/probabilist/evaluator_brier.cpp
+++ b/src/probabilist/evaluator_brier.cpp
@@ -3,7 +3,7 @@
#include <xtensor/xmasked_view.hpp>
#include <xtensor/xoperation.hpp>
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
namespace eh = evalhyd;
diff --git a/src/probabilist/evaluator_elements.cpp b/src/probabilist/evaluator_elements.cpp
index e09b179..bdce6c1 100644
--- a/src/probabilist/evaluator_elements.cpp
+++ b/src/probabilist/evaluator_elements.cpp
@@ -2,7 +2,7 @@
#include <xtensor/xview.hpp>
#include <xtensor/xsort.hpp>
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
namespace evalhyd
{
diff --git a/src/probabilist/evaluator_quantiles.cpp b/src/probabilist/evaluator_quantiles.cpp
index bd580e7..c6f37e2 100644
--- a/src/probabilist/evaluator_quantiles.cpp
+++ b/src/probabilist/evaluator_quantiles.cpp
@@ -3,7 +3,7 @@
#include <xtensor/xview.hpp>
#include <xtensor/xoperation.hpp>
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
namespace eh = evalhyd;
--
GitLab