Infeasibility - to more changeability : move call to sortConstraintsB…

…yType with his friends
AntaresSimulatorTeam · Jul 3, 2024 · bbdc230 · bbdc230
1 parent b3fc6f0
commit bbdc230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...r/infeasible-problem-analysis/include/antares/solver/infeasible-problem-analysis/report.h b/...r/infeasible-problem-analysis/include/antares/solver/infeasible-problem-analysis/report.h
@@ -44,7 +44,7 @@ class InfeasibleProblemReport
 private:
     void turnSlackVarsIntoConstraints(
       const std::vector<const operations_research::MPVariable*>& slackVariables);
-    void sortConstraints();
+    void sortConstraintsBySlackValue();
     void trimConstraints();
     void sortConstraintsByType();
     void logSuspiciousConstraints();

diff --git a/src/solver/infeasible-problem-analysis/report.cpp b/src/solver/infeasible-problem-analysis/report.cpp
@@ -43,8 +43,9 @@ InfeasibleProblemReport::InfeasibleProblemReport(
   const std::vector<const MPVariable*>& slackVariables)
 {
     turnSlackVarsIntoConstraints(slackVariables);
-    sortConstraints();
+    sortConstraintsBySlackValue();
     trimConstraints();
+    sortConstraintsByType();
 }
 
 void InfeasibleProblemReport::turnSlackVarsIntoConstraints(
@@ -56,7 +57,7 @@ void InfeasibleProblemReport::turnSlackVarsIntoConstraints(
     }
 }
 
-void InfeasibleProblemReport::sortConstraints()
+void InfeasibleProblemReport::sortConstraintsBySlackValue()
 {
     std::sort(std::begin(constraints_), std::end(constraints_), ::compareSlackSolutions);
 }
@@ -119,7 +120,6 @@ void InfeasibleProblemReport::logInfeasibilityCauses()
 
 void InfeasibleProblemReport::prettyPrint()
 {
-    sortConstraintsByType();
     logSuspiciousConstraints();
     logInfeasibilityCauses();
 }