Add a function to get all values for mip solution

AntaresSimulatorTeam · Jan 8, 2025 · 794e6a5 · 794e6a5
1 parent 9707d60
commit 794e6a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/solver/modeler/api/include/antares/solver/modeler/api/mipSolution.h b/src/solver/modeler/api/include/antares/solver/modeler/api/mipSolution.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <map>
+#include <string>
 #include <vector>
 
 #include "mipVariable.h"
@@ -51,6 +53,7 @@ class IMipSolution
     virtual double getObjectiveValue() const = 0;
     virtual double getOptimalValue(const IMipVariable* var) const = 0;
     virtual std::vector<double> getOptimalValues(const std::vector<IMipVariable*>& vars) const = 0;
+    virtual std::map<std::string, double> getAllValues() const = 0;
 };
 
 } // namespace Antares::Solver::Modeler::Api
diff --git a/src/solver/modeler/ortoolsImpl/include/antares/solver/modeler/ortoolsImpl/mipSolution.h b/src/solver/modeler/ortoolsImpl/include/antares/solver/modeler/ortoolsImpl/mipSolution.h
@@ -44,6 +44,7 @@ class OrtoolsMipSolution final: public Api::IMipSolution
     double getOptimalValue(const Api::IMipVariable* var) const override;
     std::vector<double> getOptimalValues(
       const std::vector<Api::IMipVariable*>& vars) const override;
+    std::map<std::string, double> getAllValues() const override;
 
 private:
     operations_research::MPSolver::ResultStatus status_;

diff --git a/src/solver/modeler/ortoolsImpl/mipSolution.cpp b/src/solver/modeler/ortoolsImpl/mipSolution.cpp
@@ -93,4 +93,9 @@ std::vector<double> OrtoolsMipSolution::getOptimalValues(
     return solution;
 }
 
+std::map<std::string, double> OrtoolsMipSolution::getAllValues() const
+{
+    return solution_;
+}
+
 } // namespace Antares::Solver::Modeler::OrtoolsImpl