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

CHANGELOG

@@ -157,6 +157,7 @@ Fixed bugs
 - make arithmetics in cuts.c more robust to avoid invalid scg cuts due to numerical rounding sensitivity
 - allow to copy cons_pseudoboolean even if no AND constraints are present in order to avoid a warning
 - set value for variable that is introduced to reformulate nonlinear objective function when reading .nl files with initial solution
+- fixed that multi-aggregations from PaPILO were accepted without ensuring that their bounds hold
 
 Miscellaneous
 -------------
@@ -197,7 +198,6 @@ Fixed bugs
 - update effective root depth iteratively to avoid trapping it at a single child node
 - fixed that dualsparsify presolver did not always check do-not-multiaggregate variable flag
 - fixed bug in computing elements of orbits in orbital reduction
-- fixed that multi-aggregations from PaPILO were accepted without ensuring that their bounds hold
 
 Miscellaneous
 -------------

src/objscip/objbenders.h

@@ -23,7 +23,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**@file   objbenders.h
- * @brief  C++ wrapper for Benders' decomposition
+ * @brief  C++ wrapper for the Benders' decomposition plugins
  * @author Stephen J. Maher
  */
 

src/objscip/objbenderscut.h

@@ -23,7 +23,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**@file   objbenderscut.h
- * @brief  C++ wrapper for Benders' decomposition cuts
+ * @brief  C++ wrapper for the Benders' decomposition cut plugins
  * @author Stephen J. Maher
  */
 
@@ -44,7 +44,7 @@
 namespace scip
 {
 
-/** @brief C++ wrapper for Benders' decomposition cut
+/** @brief C++ wrapper for Benders' decomposition cut plugin
  *
  *  This class defines the interface for the Benders' decomposition cuts implemented in C++. Note that there is
  *  a pure virtual function (this must be implemented). This function is: benderscut_exec().

src/objscip/objnodesel.h

@@ -41,7 +41,7 @@
 namespace scip
 {
 
-/** @brief C++ wrapper for primal heuristics
+/** @brief C++ wrapper for node selectors
  *
  *  This class defines the interface for node selectors implemented in C++. Note that there is a pure virtual
  *  function (this function has to be implemented). This function is: scip_comp().

src/objscip/objreader.cpp

@@ -23,7 +23,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**@file   objreader.cpp
- * @brief  C++ wrapper for file readers
+ * @brief  C++ wrapper for file readers and writers
  * @author Tobias Achterberg
  */
 

src/objscip/objrelax.cpp

@@ -23,7 +23,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**@file   objrelax.cpp
- * @brief  C++ wrapper for relaxators
+ * @brief  C++ wrapper for relaxation handlers
  * @author Tobias Achterberg
  */
 

src/scip/scip_copy.c

@@ -1050,7 +1050,7 @@ SCIP_RETCODE copyVars(
       SCIP_Bool infeasible;
       SCIP_Bool fixed;
 
-      if( SCIPvarIsRelaxationOnly(sourcevars[i]) )
+      if( SCIPvarIsRelaxationOnly(fixedvars[i]) )
          continue;
 
       /* retrieve target variable as image of the source variable */