fix compile

AntaresSimulatorTeam · Feb 13, 2024 · ecd889e · ecd889e
1 parent 692ac21
commit ecd889e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 38 deletions.
diff --git a/src/libs/antares/CMakeLists.txt b/src/libs/antares/CMakeLists.txt
@@ -577,6 +577,7 @@ target_include_directories(libantares-core
 
 target_link_libraries(libantares-core
 	PUBLIC
+        ortools::ortools
 		yuni-static-core
 		yuni-static-uuid
 		libantares-core-calendar

diff --git a/src/solver/utils/CMakeLists.txt b/src/solver/utils/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SRC
         ortools_utils.cpp
         filename.h
         filename.cpp
-        named_problem.h
+        include/antares/solver/utils/named_problem.h
         named_problem.cpp
         mps_utils.h
         mps_utils.cpp
@@ -26,3 +26,8 @@ target_link_libraries(utils
         sirius_solver
         libantares-core
         )
+
+target_include_directories(utils
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
diff --git a/src/solver/utils/mps_utils.h b/src/solver/utils/mps_utils.h
@@ -8,7 +8,7 @@ extern "C"
 #include "srs_api.h"
 }
 
-#include "named_problem.h"
+#include "include/antares/solver/utils/named_problem.h"
 #include "ortools_utils.h"
 
 using namespace Antares;

diff --git a/src/solver/utils/named_problem.cpp b/src/solver/utils/named_problem.cpp
@@ -4,10 +4,10 @@ namespace Antares
 {
 namespace Optimization
 {
-using BasisStatus = operations_research::MPSolver::BasisStus;
+using BasisStatus = operations_research::MPSolver::BasisStatus;
 
-PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(const std::vector<std::string>& NomDesVariables,
-                                                 const std::vector<std::string>& NomDesContraintes,
+PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(std::vector<std::string>& NomDesVariables,
+                                                 std::vector<std::string>& NomDesContraintes,
                                                  std::vector<BasisStatus>& StatutDesVariables,
                                                  std::vector<BasisStatus>& StatutDesContraintes) :
  NomDesVariables(NomDesVariables),

diff --git a/src/solver/utils/named_problem.h b/src/solver/utils/named_problem.h
diff --git a/src/solver/utils/ortools_wrapper.h b/src/solver/utils/ortools_wrapper.h
@@ -1,8 +1,7 @@
 #ifndef __ORTOOLS_WRAPPER__
 #define __ORTOOLS_WRAPPER__
 
-#include "named_problem.h"
-
+#include "include/antares/solver/utils/named_problem.h"
 using namespace operations_research;
 
 MPSolver* ORTOOLS_Simplexe(Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* Probleme,