Skip to content

Commit

Permalink
Merge branch '3655-wrong-assertion-when-static-row-ordering-and-stati…
Browse files Browse the repository at this point in the history
…c-column-ordering-in-orbitopal-fixing-2' into 'v90-bugfix'

Resolve "Wrong assertion when static row-ordering and static column-ordering in orbitopal fixing"

See merge request integer/scip!3281
  • Loading branch information
Christopher Hojny committed Dec 20, 2023
2 parents f853c59 + df8f54f commit d04abaa
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/scip/symmetry_orbitopal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1297,8 +1297,6 @@ SCIP_RETCODE getColumnOrder(
SCIP* scip, /**< SCIP data structure */
ORBITOPEDATA* orbidata, /**< orbitope data */
SCIP_NODE* eventnode, /**< node where this should be determined at */
int* roworder, /**< array with the row order, of size nselrows */
int nselrows, /**< number of rows (required to be positive) */
int** colorder, /**< array to populate with column order, of size ncols */
int** colorderinv /**< array to populate with inverse column order, of size ncols */
)
Expand All @@ -1312,8 +1310,6 @@ SCIP_RETCODE getColumnOrder(
assert( scip != NULL );
assert( orbidata != NULL );
assert( eventnode != NULL );
assert( roworder != NULL );
assert( nselrows > 0 );
assert( colorder != NULL );
assert( colorderinv != NULL );

Expand Down Expand Up @@ -2067,7 +2063,7 @@ SCIP_RETCODE propagateOrbitope(
goto FREEROWS;

/* get column order */
SCIP_CALL( getColumnOrder(scip, orbidata, focusnode, roworder, nselrows, &colorder, &colorderinv) );
SCIP_CALL( getColumnOrder(scip, orbidata, focusnode, &colorder, &colorderinv) );

#ifndef NDEBUG
/* DEBUG: if propagation is repeated in the same node, the same column order and row order is needed */
Expand Down

0 comments on commit d04abaa

Please sign in to comment.