Print solution values in the logs if a solution exists (#2562)

Co-authored-by: Vincent Payet <vincent.payet@rte-france.com>
AntaresSimulatorTeam · Jan 8, 2025 · 306d8f3 · 306d8f3
1 parent 69a5225
commit 306d8f3
Show file tree

Hide file tree

Showing 4 changed files with 31 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 const std::map<std::string, double>& solutionValues() const = 0;
 };
 
 } // namespace Antares::Solver::Modeler::Api
diff --git a/src/solver/modeler/main.cpp b/src/solver/modeler/main.cpp
@@ -19,6 +19,8 @@
  * along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
  */
 
+#include <fstream>
+
 #include <antares/logs/logs.h>
 #include <antares/solver/modeler/api/linearProblemBuilder.h>
 #include <antares/solver/modeler/loadFiles/loadFiles.h>
@@ -75,6 +77,26 @@ int main(int argc, const char** argv)
 
         logs.info() << "Number of variables: " << pb.variableCount();
         logs.info() << "Number of constraints: " << pb.constraintCount();
+
+        logs.info() << "Launching resolution...";
+        auto* solution = pb.solve(parameters.solverLogs);
+        switch (solution->getStatus())
+        {
+        case Antares::Solver::Modeler::Api::MipStatus::OPTIMAL:
+        case Antares::Solver::Modeler::Api::MipStatus::FEASIBLE:
+            if (!parameters.noOutput)
+            {
+                logs.info() << "Writing variables...";
+                std::ofstream sol_out(std::filesystem::current_path() / "solution.csv");
+                for (const auto& [name, value]: solution->solutionValues())
+                {
+                    sol_out << name << " " << value << std::endl;
+                }
+            }
+            break;
+        default:
+            logs.error() << "Problem during linear optimization";
+        }
     }
     catch (const LoadFiles::ErrorLoadingYaml&)
     {

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;
+    const std::map<std::string, double>& solutionValues() 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;
 }
 
+const std::map<std::string, double>& OrtoolsMipSolution::solutionValues() const
+{
+    return solution_;
+}
+
 } // namespace Antares::Solver::Modeler::OrtoolsImpl