Skip to content

Commit

Permalink
Merge branch '3802-sepa_multilinear-needs-copy-functionality' into 'm…
Browse files Browse the repository at this point in the history
…aster'

Bugfix for #3802

Closes #3802

See merge request integer/scip!3604
  • Loading branch information
discopt committed Dec 11, 2024
2 parents 25140d9 + 24008b4 commit 6177171
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
15 changes: 15 additions & 0 deletions src/scip/sepa_multilinear.c
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,20 @@ SCIP_RETCODE separate(
* Callback methods of separator.
*/

/** copy method for separator plugins (called when SCIP copies plugins) */
static
SCIP_DECL_SEPACOPY(sepaCopyMultilinear)
{ /*lint --e{715}*/
assert(scip != NULL);
assert(sepa != NULL);
assert(strcmp(SCIPsepaGetName(sepa), SEPA_NAME) == 0);

/* call inclusion method of separator */
SCIP_CALL( SCIPincludeSepaMultilinear(scip) );

return SCIP_OKAY;
}

/** Destructor of separator to free user data (called when SCIP is exiting). */
static
SCIP_DECL_SEPAFREE(sepaFreeMultilinear)
Expand Down Expand Up @@ -1430,6 +1444,7 @@ SCIP_RETCODE SCIPincludeSepaMultilinear(
assert(sepa != NULL);

/* set non fundamental callbacks via setter functions */
SCIP_CALL( SCIPsetSepaCopy(scip, sepa, sepaCopyMultilinear) );
SCIP_CALL( SCIPsetSepaFree(scip, sepa, sepaFreeMultilinear) );
SCIP_CALL( SCIPsetSepaInit(scip, sepa, sepaInitMultilinear) );
SCIP_CALL( SCIPsetSepaExitsol(scip, sepa, sepaExitsolMultilinear) );
Expand Down
3 changes: 1 addition & 2 deletions tests/src/scip/copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ const char* const missing[] =
"compression",
"solvingphases",
"presolving/implint",
"propagating/symmetry",
"separating/multilinear"
"propagating/symmetry"
};
const int nmissing = sizeof(missing) / sizeof(missing[0]);

Expand Down

0 comments on commit 6177171

Please sign in to comment.