Changeset 1180 for trunk


Ignore:
Timestamp:
Jun 10, 2015 3:27:24 PM (4 years ago)
Author:
stefan
Message:

add support for upcoming SCIP 3.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/heuristics/cons_rowcuts.cpp

    r900 r1180  
    374374   conshdlrdata->ncuttingrounds = 0;
    375375
    376 #if SCIP_VERSION >= 300
     376#if SCIP_VERSION >= 320
     377   /* include constraint handler */
     378   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
     379         CONSHDLR_SEPAPRIORITY, CONSHDLR_ENFOPRIORITY, CONSHDLR_CHECKPRIORITY,
     380         CONSHDLR_SEPAFREQ, CONSHDLR_PROPFREQ, CONSHDLR_EAGERFREQ, CONSHDLR_MAXPREROUNDS,
     381         CONSHDLR_DELAYSEPA, CONSHDLR_DELAYPROP, CONSHDLR_NEEDSCONS,
     382         SCIP_PROPTIMING_BEFORELP, SCIP_PRESOLTIMING_NONE,
     383         conshdlrCopyRowcuts,
     384         consFreeRowcuts, consInitRowcuts, consExitRowcuts,
     385         consInitpreRowcuts, consExitpreRowcuts, consInitsolRowcuts, consExitsolRowcuts,
     386         consDeleteRowcuts, consTransRowcuts, consInitlpRowcuts,
     387         consSepalpRowcuts, consSepasolRowcuts, consEnfolpRowcuts, consEnfopsRowcuts, consCheckRowcuts,
     388         consPropRowcuts, consPresolRowcuts, consRespropRowcuts, consLockRowcuts,
     389         consActiveRowcuts, consDeactiveRowcuts,
     390         consEnableRowcuts, consDisableRowcuts, NULL,
     391         consPrintRowcuts, consCopyRowcuts, consParseRowcuts, NULL, NULL, NULL,
     392         conshdlrdata) );
     393#elif SCIP_VERSION >= 300
    377394   /* include constraint handler */
    378395   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
     
    428445   /* add rowcuts constraint handler parameters */
    429446   SCIP_CALL( SCIPaddIntParam(scip,
    430          "constraints/"CONSHDLR_NAME"/maxcuttingrounds",
     447         "constraints/" CONSHDLR_NAME "/maxcuttingrounds",
    431448         "how many rounds of cuts should be applied at most?",
    432449         &conshdlrdata->maxcuttingrounds, FALSE, DEFAULT_MAXCUTTINGROUNDS, -1, INT_MAX, NULL, NULL) );
Note: See TracChangeset for help on using the changeset viewer.