Changeset 1873 for stable/2.8/Cbc/src


Ignore:
Timestamp:
Feb 13, 2013 12:45:47 PM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 1872

Location:
stable/2.8/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcModel.cpp

    r1845 r1873  
    73517351                if (thisCut->violated(cbcColSolution_) > primalTolerance ||
    73527352                        thisCut->effectiveness() == COIN_DBL_MAX) {
    7353 #ifndef NDEBUG
     7353#if 0 //ndef NDEBUG
    73547354                  printf("Global cut added - violation %g\n",
    73557355                           thisCut->violated(cbcColSolution_)) ;
  • stable/2.8/Cbc/src/Cbc_ampl.cpp

    r1750 r1873  
    145145static Option_Info Oinfo = {
    146146    const_cast<char*>("cbc"),
    147     const_cast<char*>("CBC trunk"),
     147    const_cast<char*>("CBC " CBC_VERSION),
    148148    const_cast<char*>("cbc_options"),
    149149    keywds,
    150150    nkeywds,
    151151    0,
    152     const_cast<char*>(""),
     152    0,
    153153    0,
    154154    decodePhrase,
Note: See TracChangeset for help on using the changeset viewer.