Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v9-minor'
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Jan 5, 2025
2 parents 91dfed9 + 48df5aa commit 62aeba7
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions src/scip/cutpool.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,8 @@ SCIP_RETCODE SCIPcutpoolAddRow(
if( row->len == 0 )
return SCIP_OKAY;

if( !row->validminmaxidx )
{
/* only called to ensure that minidx and maxidx are up to date */
(void) SCIProwGetMaxidx(row, set);
}
assert(row->validminmaxidx);
/* ensure validity of minidx and maxidx for hash key comparison */
(void)SCIProwGetMaxidx(row, set);

othercut = (SCIP_CUT*)SCIPhashtableRetrieve(cutpool->hashtable, (void*)row);
/* check in hash table, if cut already exists in the pool */
Expand Down Expand Up @@ -757,14 +753,10 @@ SCIP_RETCODE SCIPcutpoolAddNewRow(
return SCIP_INVALIDDATA;
}

assert(! row->inglobalcutpool);
assert(!row->inglobalcutpool);

if( !row->validminmaxidx )
{
/* only called to ensure that minidx and maxidx are up-to-date */
(void) SCIProwGetMaxidx(row, set);
}
assert(row->validminmaxidx);
/* ensure validity of minidx and maxidx for hash key comparison */
(void)SCIProwGetMaxidx(row, set);

/* create the cut */
SCIP_CALL( cutCreate(&cut, blkmem, row) );
Expand Down

0 comments on commit 62aeba7

Please sign in to comment.