Changeset 2173


Ignore:
Timestamp:
Mar 23, 2015 5:38:22 AM (4 years ago)
Author:
forrest
Message:

previous change was maybe a bit too much

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc/src/CbcSolver.cpp

    r2172 r2173  
    17131713        gomoryGen.setLimit(50);
    17141714        // set default action (0=off,1=on,2=root)
     1715#ifdef SWAP_GOMORY
    17151716        int gomoryAction = 0;
     1717#else
     1718        int gomoryAction = 3;
     1719#endif
    17161720
    17171721        CglProbing probingGen;
     
    17541758        //GMIGen.setLimit(100);
    17551759        // set default action (0=off,1=on,2=root)
     1760#ifdef SWAP_GOMORY
     1761        int GMIAction = 3;
     1762#else
    17561763        // Off
    1757         int GMIAction = 3;
     1764        int GMIAction = 0;
     1765#endif
    17581766
    17591767        CglFakeClique cliqueGen(NULL, false);
     
    23162324                                        generalMessageHandler->message(CLP_GENERAL, generalMessages)
    23172325                                        << message << CoinMessageEol;
     2326#ifdef SWAP_GOMORY
    23182327                                    GMIAction = 3;
    23192328                                    message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("ifmove");
     2329#else
     2330                                    GMIAction = 2;
     2331                                    message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("root");
     2332#endif
    23202333                                    if (!noPrinting_&&message)
    23212334                                        generalMessageHandler->message(CLP_GENERAL, generalMessages)
Note: See TracChangeset for help on using the changeset viewer.