From b1554f4bf3e5ce6f4420ce442efe0d6fea5b9454 Mon Sep 17 00:00:00 2001
From: Thibault Hallouin <thibault.hallouin@inrae.fr>
Date: Thu, 19 May 2022 16:02:34 +0200
Subject: [PATCH] make folder and header file names consistent
---
include/evalhyd/determinist.hpp | 2 +-
.../{deterministic => determinist}/evaluator.hpp | 0
include/evalhyd/probabilist.hpp | 2 +-
.../evalhyd/{probabilistic => probabilist}/evaluator.h | 0
.../{probabilistic => probabilist}/evaluator_brier.cpp | 0
.../evaluator_elements.cpp | 0
.../{probabilistic => probabilist}/evaluator_utils.cpp | 0
tests/CMakeLists.txt | 10 +++++-----
8 files changed, 7 insertions(+), 7 deletions(-)
rename include/evalhyd/{deterministic => determinist}/evaluator.hpp (100%)
rename include/evalhyd/{probabilistic => probabilist}/evaluator.h (100%)
rename include/evalhyd/{probabilistic => probabilist}/evaluator_brier.cpp (100%)
rename include/evalhyd/{probabilistic => probabilist}/evaluator_elements.cpp (100%)
rename include/evalhyd/{probabilistic => probabilist}/evaluator_utils.cpp (100%)
diff --git a/include/evalhyd/determinist.hpp b/include/evalhyd/determinist.hpp
index 7bb8068..da8e659 100644
--- a/include/evalhyd/determinist.hpp
+++ b/include/evalhyd/determinist.hpp
@@ -6,7 +6,7 @@
#include <xtensor/xexpression.hpp>
#include "utils.hpp"
-#include "deterministic/evaluator.hpp"
+#include "determinist/evaluator.hpp"
namespace eh = evalhyd;
diff --git a/include/evalhyd/deterministic/evaluator.hpp b/include/evalhyd/determinist/evaluator.hpp
similarity index 100%
rename from include/evalhyd/deterministic/evaluator.hpp
rename to include/evalhyd/determinist/evaluator.hpp
diff --git a/include/evalhyd/probabilist.hpp b/include/evalhyd/probabilist.hpp
index 340573e..65be0d0 100644
--- a/include/evalhyd/probabilist.hpp
+++ b/include/evalhyd/probabilist.hpp
@@ -8,7 +8,7 @@
#include <xtensor/xview.hpp>
#include "utils.hpp"
-#include "probabilistic/evaluator.h"
+#include "probabilist/evaluator.h"
namespace eh = evalhyd;
diff --git a/include/evalhyd/probabilistic/evaluator.h b/include/evalhyd/probabilist/evaluator.h
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator.h
rename to include/evalhyd/probabilist/evaluator.h
diff --git a/include/evalhyd/probabilistic/evaluator_brier.cpp b/include/evalhyd/probabilist/evaluator_brier.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_brier.cpp
rename to include/evalhyd/probabilist/evaluator_brier.cpp
diff --git a/include/evalhyd/probabilistic/evaluator_elements.cpp b/include/evalhyd/probabilist/evaluator_elements.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_elements.cpp
rename to include/evalhyd/probabilist/evaluator_elements.cpp
diff --git a/include/evalhyd/probabilistic/evaluator_utils.cpp b/include/evalhyd/probabilist/evaluator_utils.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_utils.cpp
rename to include/evalhyd/probabilist/evaluator_utils.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a238623..7029a22 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,12 +27,12 @@ add_executable(
test_determinist.cpp
../include/evalhyd/utils.hpp
../include/evalhyd/determinist.hpp
- ../include/evalhyd/deterministic/evaluator.hpp
+ ../include/evalhyd/determinist/evaluator.hpp
test_probabilist.cpp
../include/evalhyd/probabilist.hpp
- ../include/evalhyd/probabilistic/evaluator.h
- ../include/evalhyd/probabilistic/evaluator_brier.cpp
- ../include/evalhyd/probabilistic/evaluator_elements.cpp
- ../include/evalhyd/probabilistic/evaluator_utils.cpp
+ ../include/evalhyd/probabilist/evaluator.h
+ ../include/evalhyd/probabilist/evaluator_brier.cpp
+ ../include/evalhyd/probabilist/evaluator_elements.cpp
+ ../include/evalhyd/probabilist/evaluator_utils.cpp
)
target_link_libraries(evalhyd_tests gtest gtest_main)
--
GitLab