Correct mineff for conflicts

Opt-Mucca · Opt-Mucca · commit 4d45a7226c49 · 2025-08-13T17:33:38.000+02:00
diff --git a/highs/mip/HighsCutGeneration.cpp b/highs/mip/HighsCutGeneration.cpp
@@ -1951,7 +1951,11 @@ bool HighsCutGeneration::tryGenerateCut(std::vector<HighsInt>& inds_,
       rhs = tmpRhs;
     } else {
       // accept cut and increase minimum efficiency requirement for cmir cut
-      minMirEfficacy = std::max(minEfficacy, efficacy) + feastol;
+      if (allowRejectCut) {
+        minMirEfficacy = std::max(minEfficacy, efficacy + feastol);
+      } else {
+        minMirEfficacy = efficacy + feastol;
+      }
       std::swap(tmpRhs, rhs);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1951,7 +1951,11 @@ bool HighsCutGeneration::tryGenerateCut(std::vector<HighsInt>& inds_,`
`1951`	`1951`	`rhs = tmpRhs;`
`1952`	`1952`	`} else {`
`1953`	`1953`	`// accept cut and increase minimum efficiency requirement for cmir cut`
`1954`		`- minMirEfficacy = std::max(minEfficacy, efficacy) + feastol;`
	`1954`	`+ if (allowRejectCut) {`
	`1955`	`+ minMirEfficacy = std::max(minEfficacy, efficacy + feastol);`
	`1956`	`+ } else {`
	`1957`	`+ minMirEfficacy = efficacy + feastol;`
	`1958`	`+ }`
`1955`	`1959`	`std::swap(tmpRhs, rhs);`
`1956`	`1960`	`}`
`1957`	`1961`	`}`