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

CHANGELOG

@@ -151,6 +151,7 @@ Fixed bugs
 - simplified the objective sense assumption for the subproblems in the Lagromory separator
 - 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
 
 Miscellaneous
 -------------
@@ -241,9 +242,6 @@ Performance improvements
 - Added new branching score tiebreaker for reliability pseudo-cost branching rule
 - Try nearest bound if zero solution value is out of bounds in heuristic trivial.
 
-Examples and applications
--------------------------
-
 Interface changes
 -----------------
 
@@ -663,9 +661,6 @@ Miscellaneous
   SCIPdebugSolIsValidInSubtree, SCIPdebugIsMainscip, SCIPdebugSolEnable, SCIPdebugSolDisable, SCIPdebugSolIsEnabled,
   SCIPwithDebugSol are now exported
 
-Known bugs
-----------
-
 @section RN802 SCIP 8.0.2
 *************************
 
@@ -746,6 +741,7 @@ Miscellaneous
 
 @section RN801 SCIP 8.0.1
 *************************
+
 Features
 --------
 
@@ -1645,9 +1641,6 @@ Unit tests
 - added sepa/rlt/separation.c
 - added tests test_compute_symmetry:expr{1,2,3,4} in symmetry/compute.c
 
-Testing
--------
-
 Build system
 ------------
 
@@ -1704,9 +1697,6 @@ Miscellaneous
   different emphasis settings.
 - If a lazy bound is set to a value that is tighter than the current global bound, then the global bound is now tightened accordingly.
 
-Known bugs
-----------
-
 @page RN70 Release notes for SCIP 7.0
 
 @section RN703 SCIP 7.0.3
@@ -1795,8 +1785,6 @@ Examples and applications
 Interface changes
 -----------------
 
-### New and changed callbacks
-
 ### Deleted and changed API methods
 
 - deprecated SCIPsetParam(); use SCIPsetIntParam(), SCIPsetRealParam(), etc, instead
@@ -1806,32 +1794,6 @@ Interface changes
 - new function SCIPcolGetVarProbindex() for accessing the probindex of a variable corresponding to a column
 - added new sorting functions SCIPsortPtrRealRealBoolBool()
 
-### Command line interface
-
-### Interfaces to external software
-
-### Changed parameters
-
-### New parameters
-
-### Data structures
-
-Deleted files
--------------
-
-Unit tests
-----------
-
-Testing
--------
-
-Build system
-------------
-
-### Cmake
-
-### Makefile
-
 Fixed bugs
 ----------
 
@@ -1857,12 +1819,6 @@ Fixed bugs
 - Fixed issue with multi-aggregated variables
 - Fixed issue in with buffer memory in cons_cumulative
 
-Miscellaneous
--------------
-
-Known bugs
-----------
-
 @section RN701 SCIP 7.0.1
 *************************
 
@@ -2764,6 +2720,7 @@ Fixed bugs
 
 Miscellaneous
 -------------
+
 - do not scale linear constraints to integral coefficients
 
 @section RN600 SCIP 6.0.0

src/scip/prop_symmetry.c

@@ -645,7 +645,7 @@ SCIP_DECL_TABLEOUTPUT(tableOutputSymmetry)
       if ( tabledata->propdata->orbitopalreddata )
       {
          SCIP_CALL( SCIPorbitopalReductionGetStatistics(scip, tabledata->propdata->orbitopalreddata, &nred, &ncutoff) );
-         SCIPverbMessage(scip, SCIP_VERBLEVEL_MINIMAL, file, "  orbitopal reduction: %10d reductions applied,"
+         SCIPverbMessage(scip, SCIP_VERBLEVEL_MINIMAL, file, "  orbitopal red.   : %10d reductions applied,"
             " %10d cutoffs\n", nred, ncutoff);
       }
       if ( tabledata->propdata->orbitalreddata )

src/scip/symmetry.c

@@ -2005,14 +2005,17 @@ SCIP_RETCODE isDoublelLexSym(
    }
 
    /* store begin positions of row and column blocks */
-   SCIP_CALL( SCIPallocBlockMemoryArray(scip, rowsbegin, nmatrices2 + 1) );
-   SCIP_CALL( SCIPallocBlockMemoryArray(scip, colsbegin, nmatrices1 + 1) );
-   (*rowsbegin)[0] = 0;
-   (*colsbegin)[0] = 0;
-   for (j = 0; j < nmatrices2; ++j)
-      (*rowsbegin)[j + 1] = (*rowsbegin)[j] + ncols2[j];
-   for (j = 0; j < nmatrices1; ++j)
-      (*colsbegin)[j + 1] = (*colsbegin)[j] + ncols1[j];
+   if ( *success )
+   {
+      SCIP_CALL( SCIPallocBlockMemoryArray(scip, rowsbegin, nmatrices2 + 1) );
+      SCIP_CALL( SCIPallocBlockMemoryArray(scip, colsbegin, nmatrices1 + 1) );
+      (*rowsbegin)[0] = 0;
+      (*colsbegin)[0] = 0;
+      for (j = 0; j < nmatrices2; ++j)
+         (*rowsbegin)[j + 1] = (*rowsbegin)[j] + ncols2[j];
+      for (j = 0; j < nmatrices1; ++j)
+         (*colsbegin)[j + 1] = (*colsbegin)[j] + ncols1[j];
+   }
 
  FREEMEMORY:
    SCIPfreeBufferArray(scip, &sortvals);
@@ -2024,8 +2027,6 @@ SCIP_RETCODE isDoublelLexSym(
          SCIPfreeBlockMemoryArray(scip, &(*doublelexmatrix)[i], *ncols);
       }
       SCIPfreeBlockMemoryArray(scip, doublelexmatrix, *nrows);
-      SCIPfreeBlockMemoryArray(scip, rowsbegin, nmatrices2 + 1);
-      SCIPfreeBlockMemoryArray(scip, colsbegin, nmatrices1 + 1);
       *doublelexmatrix = NULL;
       *rowsbegin = NULL;
       *colsbegin = NULL;
@@ -2177,14 +2178,6 @@ SCIP_RETCODE SCIPdetectSingleOrDoubleLexMatrices(
       *success = TRUE;
       *isorbitope = TRUE;
    }
-#ifndef NDEBUG
-   else if ( !(*success) )
-   {
-      assert( *lexmatrix == NULL );
-      assert( *lexrowsbegin == NULL );
-      assert( *lexcolsbegin == NULL );
-   }
-#endif
 
  FREEMEMORY:
    for (p = nmatricestype2 - 1; p >= 0; --p)

src/scip/symmetry_orbital.c

@@ -238,7 +238,7 @@ SCIP_RETCODE identifyOrbitalSymmetriesBroken(
 
       /* the orbit must have the same bounds */
       orbitsymbroken = FALSE;
-      j = varorbitids[orbitbegin];
+      j = varorbitidssort[orbitbegin];
       orbitglb = orcdata->globalvarlbs[j];
       orbitgub = orcdata->globalvarubs[j];
       for (i = orbitbegin + 1; i < orcdata->npermvars; ++i)
@@ -258,8 +258,14 @@ SCIP_RETCODE identifyOrbitalSymmetriesBroken(
             }
          }
       }
-      /* the loop above has terminated, so i is either orcdata->npermvars or varorbitidssort[i] is in the next orbit,
-       * and orbitglb and orbitgub are the maximal global lower bound and minimal global upper bound in orbit orbitid */
+      assert( orbitsymbroken || i == orcdata->npermvars || varorbitids[j] != orbitid );
+
+      /* in case we terminated the orbit due to broken symmetries, find the correct end of the orbit */
+      if ( orbitsymbroken )
+      {
+         while ( i < orcdata->npermvars && varorbitids[j] == orbitid )
+            j = varorbitidssort[++i];
+      }
       orbitend = i;
 
       /* symmetry is broken within this orbit if the intersection of the global variable domains are empty */