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

scipopt · Nov 24, 2024 · 2169baf · 2169baf
2 parents a3c3014 + b790625
commit 2169baf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -154,6 +154,7 @@ Fixed bugs
 - apply same feasibility definition in PaPILO as SCIP to avoid numerical inconsistencies
 - check variable cancellation in SCIPvarAddVlb() and SCIPvarAddVub() to avert wrong infeasibility
 - SCIPfreeReoptSolve now also clears the partial solutions
+- fixed bug in calculation of "fractionality score" for spatial branching candidates in cons_nonlinear
 
 Unit tests
 ----------

diff --git a/src/scip/cons_nonlinear.c b/src/scip/cons_nonlinear.c
@@ -6714,6 +6714,7 @@ SCIP_RETCODE collectBranchingCandidates(
                cands[*ncands].expr = consdata->varexprs[i];
                cands[*ncands].var = var;
                cands[*ncands].auxviol = SCIPgetExprViolScoreNonlinear(consdata->varexprs[i]);
+               cands[*ncands].fractionality = 0.0;
                ++(*ncands);
 
                /* invalidate violscore-tag, so that we do not register variables that appear in multiple constraints
@@ -6752,6 +6753,7 @@ SCIP_RETCODE collectBranchingCandidates(
                cands[*ncands].expr = expr;
                cands[*ncands].var = var;
                cands[*ncands].auxviol = SCIPgetExprViolScoreNonlinear(expr);
+               cands[*ncands].fractionality = 0.0;
                ++(*ncands);
             }
          }
@@ -7169,7 +7171,7 @@ void scoreBranchingCandidates(
 
       if( maxscore.fractionality > 0.0 )
       {
-         cands[c].fractionality += conshdlrdata->branchfracweight * cands[c].fractionality / maxscore.fractionality;
+         cands[c].weighted += conshdlrdata->branchfracweight * cands[c].fractionality / maxscore.fractionality;
          weightsum += conshdlrdata->branchfracweight;
 
          ENFOLOG( SCIPinfoMessage(scip, enfologfile, " %+g*%6.2g(frac)", conshdlrdata->branchfracweight, cands[c].fractionality / maxscore.fractionality); )