Changeset 309


Ignore:
Timestamp:
Oct 29, 2009 9:50:22 PM (10 years ago)
Author:
bjarni
Message:

Uncommented calls to coinSetClpOptions() and coinSetCbcOptions() after CbcMain0()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.4/CoinMP/src/CoinMP.cpp

    r308 r309  
    15611561#ifdef NEW_STYLE_CBCMAIN
    15621562                if (CoinGetIntOption(hProb, COIN_INT_MIPUSECBCMAIN)) {
    1563                         //coinSetClpOptions(hProb);
    1564                         //coinSetCbcOptions(hProb);
     1563                        if (!pCoin->CbcMain0Already) {
     1564                                CbcMain0(*pCoin->cbc);
     1565                                pCoin->CbcMain0Already = 1;
     1566                        }
     1567                        coinSetClpOptions(hProb);
     1568                        coinSetCbcOptions(hProb);
    15651569                        //coinSetCglOptions(hProb);  BK: CbcMain1 should be calling the Cgl's automatically
    15661570                        CbcOrClpRead_mode = 1;  // BK: Fix bug in CbcMain1, CbcOrClpRead_mode not initialized  (CpcSolver.cpp, stable 2.2)
Note: See TracChangeset for help on using the changeset viewer.