Merge remote-tracking branch 'origin/v10-minor'

scip-ci · scip-ci · commit 2a4dc74007fc · 2025-12-27T18:15:36.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -74,6 +74,7 @@ Fixed bugs
 - also set real solution in SCIPsolSetValExact() to maintain approximation
 - handle exact solutions in SCIPsolCheckOrig(), SCIPcheckSolOrig(), and SCIPrecomputeSolObj() to correctly check exact initial solutions in SCIPtransformProb()
 - fixed use of interactive option (-i) of AMPL interface
+- fix calculation of Euclidean norm in calcEfficacyDenseStorage() for use in exact solving
 
 Miscellaneous
 -------------
diff --git a/src/scip/cuts.c b/src/scip/cuts.c
@@ -607,7 +607,7 @@ SCIP_Real calcEfficacyDenseStorage(
          activity += coef * SCIPgetSolVal(scip, sol, vars[cutinds[i]]);
          norm += SQR(coef);
       }
-      norm = SQR(norm);
+      norm = sqrt(norm);
       break;
    case 'm':
       for( i = 0; i < cutnnz; ++i )

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ SCIP_Real calcEfficacyDenseStorage(`
`607`	`607`	`activity += coef * SCIPgetSolVal(scip, sol, vars[cutinds[i]]);`
`608`	`608`	`norm += SQR(coef);`
`609`	`609`	`}`
`610`		`- norm = SQR(norm);`
	`610`	`+ norm = sqrt(norm);`
`611`	`611`	`break;`
`612`	`612`	`case 'm':`
`613`	`613`	`for( i = 0; i < cutnnz; ++i )`