Commit da78292b authored by Thibault Hallouin's avatar Thibault Hallouin
Browse files

fix compilation bugs

1 merge request!2refactor structure and proper cmake instructions
Showing with 16 additions and 18 deletions
+16 -18
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <xtensor/xexpression.hpp> #include <xtensor/xtensor.hpp>
#include <xtensor/xarray.hpp> #include <xtensor/xarray.hpp>
......
...@@ -22,14 +22,13 @@ namespace evalhyd ...@@ -22,14 +22,13 @@ namespace evalhyd
const xt::xtensor<double, 2>& q_obs, const xt::xtensor<double, 2>& q_obs,
const xt::xtensor<double, 2>& q_prd, const xt::xtensor<double, 2>& q_prd,
const std::vector<std::string>& metrics, const std::vector<std::string>& metrics,
const std::string& transform = "none", const std::string& transform,
const double exponent = 1, const double exponent,
double epsilon = -9, double epsilon,
const xt::xtensor<bool, 2>& t_msk = {}, const xt::xtensor<bool, 2>& t_msk,
const xt::xtensor<std::array<char, 32>, 1>& m_cdt = {}, const xt::xtensor<std::array<char, 32>, 1>& m_cdt,
const std::unordered_map<std::string, int>& bootstrap = const std::unordered_map<std::string, int>& bootstrap,
{{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}}, const std::vector<std::string>& dts
const std::vector<std::string>& dts = {}
) )
{ {
// check that the metrics to be computed are valid // check that the metrics to be computed are valid
......
...@@ -22,12 +22,11 @@ namespace evalhyd ...@@ -22,12 +22,11 @@ namespace evalhyd
const xt::xtensor<double, 2>& q_obs, const xt::xtensor<double, 2>& q_obs,
const xt::xtensor<double, 4>& q_prd, const xt::xtensor<double, 4>& q_prd,
const std::vector<std::string>& metrics, const std::vector<std::string>& metrics,
const xt::xtensor<double, 2>& q_thr = {}, const xt::xtensor<double, 2>& q_thr,
const xt::xtensor<bool, 4>& t_msk = {}, const xt::xtensor<bool, 4>& t_msk,
const xt::xtensor<std::array<char, 32>, 2>& m_cdt = {}, const xt::xtensor<std::array<char, 32>, 2>& m_cdt,
const std::unordered_map<std::string, int>& bootstrap = const std::unordered_map<std::string, int>& bootstrap,
{{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}}, const std::vector<std::string>& dts
const std::vector<std::string>& dts = {}
) )
{ {
// check that the metrics to be computed are valid // check that the metrics to be computed are valid
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <xtensor/xmasked_view.hpp> #include <xtensor/xmasked_view.hpp>
#include <xtensor/xoperation.hpp> #include <xtensor/xoperation.hpp>
#include "evaluator.h" #include "probabilist/evaluator.hpp"
namespace eh = evalhyd; namespace eh = evalhyd;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <xtensor/xview.hpp> #include <xtensor/xview.hpp>
#include <xtensor/xsort.hpp> #include <xtensor/xsort.hpp>
#include "evaluator.h" #include "probabilist/evaluator.hpp"
namespace evalhyd namespace evalhyd
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <xtensor/xview.hpp> #include <xtensor/xview.hpp>
#include <xtensor/xoperation.hpp> #include <xtensor/xoperation.hpp>
#include "evaluator.h" #include "probabilist/evaluator.hpp"
namespace eh = evalhyd; namespace eh = evalhyd;
......
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