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

scipopt · Jan 12, 2025 · 11d9afd · 11d9afd
2 parents 5372f6f + 1d4fbd4
commit 11d9afd
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/scip/branch_multaggr.c b/src/scip/branch_multaggr.c
@@ -61,9 +61,6 @@
 #include "scip/scip_timing.h"
 #include "scip/scip_tree.h"
 #include "scip/scip_var.h"
-#include "scip/set.h"
-#include "scip/struct_scip.h"
-#include "scip/var.h"
 #include <string.h>
 
 #define BRANCHRULE_NAME            "multaggr"
@@ -349,8 +346,8 @@ SCIP_RETCODE selectVarMultAggrBranching(
                      assert(downvars != NULL);
                      assert(downvars[j] != NULL);
 
-                     pscdown = SCIPvarGetPseudocost(downvars[j], scip->stat, SCIPsetFeasFloor(scip->set, downvarssols[j]) - downvarssols[j]);
-                     pscup = SCIPvarGetPseudocost(downvars[j], scip->stat, SCIPsetFeasCeil(scip->set, downvarssols[j]) - downvarssols[j]);
+                     pscdown = SCIPgetVarPseudocostVal(scip, downvars[j], SCIPfeasFloor(scip, downvarssols[j]) - downvarssols[j]);
+                     pscup = SCIPgetVarPseudocostVal(scip, downvars[j], SCIPfeasCeil(scip, downvarssols[j]) - downvarssols[j]);
                      estimateincr = MIN(pscdown, pscup);
 
                      estimateprobdown += estimateincr;
@@ -413,8 +410,8 @@ SCIP_RETCODE selectVarMultAggrBranching(
                      assert(upvars != NULL);
                      assert(upvars[k] != NULL);
 
-                     pscdown = SCIPvarGetPseudocost(upvars[k], scip->stat, SCIPsetFeasFloor(scip->set, upvarssols[k]) - upvarssols[k]);
-                     pscup = SCIPvarGetPseudocost(upvars[k], scip->stat, SCIPsetFeasCeil(scip->set, upvarssols[k]) - upvarssols[k]);
+                     pscdown = SCIPgetVarPseudocostVal(scip, upvars[k], SCIPfeasFloor(scip, upvarssols[k]) - upvarssols[k]);
+                     pscup = SCIPgetVarPseudocostVal(scip, upvars[k], SCIPfeasCeil(scip, upvarssols[k]) - upvarssols[k]);
                      estimateincr = MIN(pscdown, pscup);
                      estimateprobup += estimateincr;
                   }