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

Author: scip-ci

CHANGELOG

@@ -84,6 +84,7 @@ Fixed bugs
 - turn off detection of definitional constraints in CONOPT for now, to work around a related issue in CONOPT 4.39.0
 - signal extreme estimations in timeSeriesEstimate() and skip pruning estimations in eventExecEstim() to avoid unstable restarting
 - fixed that variable removal in IIS cleanup tried to delete variables that were marked as not deleteable
+- fixed parallelism computation of dynamic cut selector to use Euclidean norm instead of unsupported argument
 
 Miscellaneous
 -------------

check/CMakeLists.txt

@@ -82,6 +82,7 @@ set(settings_MIP
     #separation and branching
     "oddcyclelift_randomhybrid"
     "oddcycle_distribution"
+    "cutsel_dynamic"
     "treemodel_ratio"
     "treemodel_sampling"
     "treemodel_svts_filter"

check/coverage/settings/cutsel_dynamic.set

@@ -0,0 +1,2 @@
+# enable dynamic cut selector by setting priority to maximum
+cutselection/dynamic/priority = 1073741823

src/scip/cutsel_dynamic.c

@@ -318,14 +318,14 @@ int filterWithDynamicParallelism(
 
       if( SCIPisGE(scip, bestcutefficacy, currentcutefficacy))
       {
-         cosine = SCIProwGetParallelism(bestcut, cuts[i], 's');
+         cosine = SCIProwGetParallelism(bestcut, cuts[i], 'e');
          thisparall = cosine * bestcutefficacy / currentcutefficacy;
          SCIPdebugMsg(scip, "Thisparall(%g) = cosine(%g) * (bestcutefficacy(%g)/ currentcutefficacy(%g))\n\n", thisparall,
             cosine, bestcutefficacy, currentcutefficacy);
       }
       else
       {
-         cosine = SCIProwGetParallelism(cuts[i], bestcut, 's');
+         cosine = SCIProwGetParallelism(cuts[i], bestcut, 'e');
          thisparall = cosine * currentcutefficacy / bestcutefficacy;
          SCIPdebugMsg(scip, "Thisparall(%g) = cosine(%g) * (currentcutefficacy(%g) / bestcutefficacy(%g))\n\n", thisparall,
             cosine, currentcutefficacy, bestcutefficacy);