Changeset 1444


Ignore:
Timestamp:
Jan 27, 2019 11:51:15 AM (3 months ago)
Author:
forrest
Message:

get sign correct

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.59/Cgl/src/CglPreProcess/CglPreProcess.cpp

    r1406 r1444  
    12001200  if ((tuning&1)!=0)
    12011201    options_ |= 16; // heavy stuff
     1202  if ((tuning&64)!=0)
     1203    options_ |= 64; // heavier stuff
    12021204  //bool heavyProbing = (tuning&1)!=0;
    12031205  int makeIntegers = (tuning&6)>>1;
     
    19881990                   jColumn,move,move*rhs);
    19891991#endif
    1990           offset -= move*multiply*rhs;
     1992          offset += move*multiply*rhs;
    19911993          for (CoinBigIndex j=rowStart[iRow];j<rowStart[iRow]+rowLength[iRow];j++) {
    19921994            int iColumn = column[j];
     
    23672369      else
    23682370        presolveActions=16; // actually just switch off duplicate columns for ints
     2371      if ((tuning & 32) != 0)
     2372        presolveActions |= 32;
    23692373      // Do not allow all +1 to be tampered with
    23702374      //if (allPlusOnes)
     
    51405144          int saveMaxProbe = probingCut->getMaxProbeRoot();
    51415145          int saveMaxLook = probingCut->getMaxLookRoot();
    5142           if (!iBigPass&&!iPass&&(options_&(16|64))!=0) {
    5143             noStrengthening = true;
    5144             numberPasses=1;
     5146          if ((!iBigPass||(options_&64)!=0)&&!iPass&&(options_&(16|64))!=0) {
     5147            if (!iBigPass) {
     5148              noStrengthening = true;
     5149              numberPasses=1;
     5150            }
    51455151            probingCut->setMaxProbeRoot(CoinMax(saveMaxProbe,1000));
    51465152            probingCut->setMaxElementsRoot(CoinMax(saveMaxElements,2000));
Note: See TracChangeset for help on using the changeset viewer.