Changeset 775 for stable/0.4


Ignore:
Timestamp:
Oct 2, 2011 6:39:33 PM (8 years ago)
Author:
stefan
Message:

tweak to support upcoming SCIP 2.1 too

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/heuristics/cons_rowcuts.cpp

    r690 r775  
    378378   conshdlrdata->ncuttingrounds = 0;
    379379
     380#ifdef SCIP_PROPTIMING_BEFORELP
    380381   /* include constraint handler */
    381382   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
     
    383384         CONSHDLR_SEPAFREQ, CONSHDLR_PROPFREQ, CONSHDLR_EAGERFREQ, CONSHDLR_MAXPREROUNDS,
    384385         CONSHDLR_DELAYSEPA, CONSHDLR_DELAYPROP, CONSHDLR_DELAYPRESOL, CONSHDLR_NEEDSCONS,
     386         SCIP_PROPTIMING_BEFORELP,
    385387         conshdlrCopyRowcuts,
    386388         consFreeRowcuts, consInitRowcuts, consExitRowcuts,
     
    393395         consPrintRowcuts, consCopyRowcuts, consParseRowcuts,
    394396         conshdlrdata) );
     397#else
     398   /* include constraint handler */
     399   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
     400         CONSHDLR_SEPAPRIORITY, CONSHDLR_ENFOPRIORITY, CONSHDLR_CHECKPRIORITY,
     401         CONSHDLR_SEPAFREQ, CONSHDLR_PROPFREQ, CONSHDLR_EAGERFREQ, CONSHDLR_MAXPREROUNDS,
     402         CONSHDLR_DELAYSEPA, CONSHDLR_DELAYPROP, CONSHDLR_DELAYPRESOL, CONSHDLR_NEEDSCONS,
     403         SCIP_PROPTIMING_BEFORELP,
     404         conshdlrCopyRowcuts,
     405         consFreeRowcuts, consInitRowcuts, consExitRowcuts,
     406         consInitpreRowcuts, consExitpreRowcuts, consInitsolRowcuts, consExitsolRowcuts,
     407         consDeleteRowcuts, consTransRowcuts, consInitlpRowcuts,
     408         consSepalpRowcuts, consSepasolRowcuts, consEnfolpRowcuts, consEnfopsRowcuts, consCheckRowcuts,
     409         consPropRowcuts, consPresolRowcuts, consRespropRowcuts, consLockRowcuts,
     410         consActiveRowcuts, consDeactiveRowcuts,
     411         consEnableRowcuts, consDisableRowcuts,
     412         consPrintRowcuts, consCopyRowcuts, consParseRowcuts,
     413         conshdlrdata) );
     414#endif
    395415
    396416   /* add rowcuts constraint handler parameters */
Note: See TracChangeset for help on using the changeset viewer.