Changeset 871


Ignore:
Timestamp:
Jul 16, 2012 5:07:48 PM (7 years ago)
Author:
stefan
Message:

merge r870 from stable/0.4

Location:
trunk/Couenne
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne

  • trunk/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/Couenne/src/heuristics/cons_rowcuts.cpp

    r778 r871  
    378378   conshdlrdata->ncuttingrounds = 0;
    379379
    380 #if SCIP_VERSION >= 210
     380#if SCIP_VERSION >= 300
     381   /* include constraint handler */
     382   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
     383         CONSHDLR_SEPAPRIORITY, CONSHDLR_ENFOPRIORITY, CONSHDLR_CHECKPRIORITY,
     384         CONSHDLR_SEPAFREQ, CONSHDLR_PROPFREQ, CONSHDLR_EAGERFREQ, CONSHDLR_MAXPREROUNDS,
     385         CONSHDLR_DELAYSEPA, CONSHDLR_DELAYPROP, CONSHDLR_DELAYPRESOL, CONSHDLR_NEEDSCONS,
     386         SCIP_PROPTIMING_BEFORELP,
     387         conshdlrCopyRowcuts,
     388         consFreeRowcuts, consInitRowcuts, consExitRowcuts,
     389         consInitpreRowcuts, consExitpreRowcuts, consInitsolRowcuts, consExitsolRowcuts,
     390         consDeleteRowcuts, consTransRowcuts, consInitlpRowcuts,
     391         consSepalpRowcuts, consSepasolRowcuts, consEnfolpRowcuts, consEnfopsRowcuts, consCheckRowcuts,
     392         consPropRowcuts, consPresolRowcuts, consRespropRowcuts, consLockRowcuts,
     393         consActiveRowcuts, consDeactiveRowcuts,
     394         consEnableRowcuts, consDisableRowcuts, NULL,
     395         consPrintRowcuts, consCopyRowcuts, consParseRowcuts, NULL, NULL,
     396         conshdlrdata) );
     397#elif SCIP_VERSION >= 210
    381398   /* include constraint handler */
    382399   SCIP_CALL( SCIPincludeConshdlr(scip, CONSHDLR_NAME, CONSHDLR_DESC,
Note: See TracChangeset for help on using the changeset viewer.