clang

AntaresSimulatorTeam · Apr 19, 2024 · 39d9f3b · 39d9f3b
1 parent 77074a8
commit 39d9f3b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 32 deletions.
diff --git a/src/antares-deps b/src/antares-deps
diff --git a/src/solver/optim/api/include/antares/optim/api/MipSolution.h b/src/solver/optim/api/include/antares/optim/api/MipSolution.h
@@ -32,44 +32,54 @@
 
 namespace Antares::optim::api
 {
-    class MipSolution final
+class MipSolution final
+{
+    // TODO: improve this by removing dependency to OR-Tools
+private:
+    operations_research::MPSolver::ResultStatus responseStatus_;
+    std::map<std::string, double> solution_;
+    double objectiveValue_;
+
+public:
+    MipSolution(operations_research::MPSolver::ResultStatus responseStatus,
+                const std::map<std::string, double>& solution,
+                double objectiveValue) :
+     responseStatus_(responseStatus), objectiveValue_(objectiveValue)
     {
-        // TODO: improve this by removing dependency to OR-Tools
-    private:
-        operations_research::MPSolver::ResultStatus responseStatus_;
-        std::map<std::string, double> solution_;
-        double objectiveValue_;
-    public:
-        MipSolution(operations_research::MPSolver::ResultStatus responseStatus, const std::map<std::string, double>& solution, double objectiveValue) :
-         responseStatus_(responseStatus), objectiveValue_(objectiveValue)
+        // Only store non-zero values
+        for (const auto& varAndValue : solution)
         {
-            // Only store non-zero values
-            for (const auto& varAndValue : solution)
+            if (abs(varAndValue.second) > 1e-6) // TODO: is this tolerance OK?
             {
-                if (abs(varAndValue.second) > 1e-6) // TODO: is this tolerance OK?
-                {
-                    solution_.insert(varAndValue);
-                }
+                solution_.insert(varAndValue);
             }
         }
+    }
 
-        operations_research::MPSolver::ResultStatus getStatus() { return responseStatus_; }
+    operations_research::MPSolver::ResultStatus getStatus()
+    {
+        return responseStatus_;
+    }
 
-        double getOptimalValue(const std::string& variableName)
-        {
-            return solution_.contains(variableName) ? solution_.at(variableName) : 0;
-        }
+    double getOptimalValue(const std::string& variableName)
+    {
+        return solution_.contains(variableName) ? solution_.at(variableName) : 0;
+    }
 
-        std::vector<double> getOptimalValues(const std::vector<std::string>& variableNames)
+    std::vector<double> getOptimalValues(const std::vector<std::string>& variableNames)
+    {
+        std::vector<double> solution;
+        solution.reserve(variableNames.size());
+        for (const auto& varName : variableNames)
         {
-            std::vector<double> solution;
-            solution.reserve(variableNames.size());
-            for (const auto& varName : variableNames) {
-                solution.push_back(getOptimalValue(varName));
-            }
-            return solution;
+            solution.push_back(getOptimalValue(varName));
         }
+        return solution;
+    }
 
-        double getObjectiveValue() { return objectiveValue_; }
-    };
-}
+    double getObjectiveValue()
+    {
+        return objectiveValue_;
+    }
+};
+} // namespace Antares::optim::api
diff --git a/src/solver/optim/impl/LinearProblemImpl.cpp b/src/solver/optim/impl/LinearProblemImpl.cpp
@@ -76,7 +76,7 @@ void LinearProblemImpl::setMinimization(bool isMinim)
 
 MipSolution LinearProblemImpl::solve(const operations_research::MPSolverParameters& param)
 {
-    //mpSolver->EnableOutput();
+    // mpSolver->EnableOutput();
     // std::string model;
     // std::ofstream m("/tmp/model.lp");
     // if (m && mpSolver->ExportModelAsLpFormat(false, &model))
+44 −0		.github/workflows/oracle8.yml
+52 −0		.github/workflows/releasesOracle8.yml
+6 −2		.github/workflows/releasesWindows.yml
+1 −0		CMakeLists.txt
+30 −2		cmake/dependencies/CMakeLists.txt