Changeset 1115


Ignore:
Timestamp:
Jan 8, 2009 12:09:05 PM (10 years ago)
Author:
forrest
Message:

fix feasibility pump accumulate

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcHeuristicFPump.cpp

    r1112 r1115  
    238238  const double * lower = model_->solver()->getColLower();
    239239  const double * upper = model_->solver()->getColUpper();
    240   bool doGeneral = (accumulate_&(4+8))!=0;
     240  bool doGeneral = (accumulate_&4)!=0;
    241241  j=0;
    242242  for (i=0;i<numberIntegers;i++) {
     
    261261    delete [] integerVariable;
    262262    return 0;
    263   } else if ((accumulate_&8)==0) {
     263  } else if ((accumulate_&4)==0) {
    264264    doGeneral=false;
    265265    j=0;
     
    332332      fixContinuous=2;
    333333    when_=1;
    334     usedColumn = new int [numberColumns];
    335     for (int i=0;i<numberColumns;i++)
    336       usedColumn[i]=-1;
     334    if ((accumulate_&1)!=0) {
     335      usedColumn = new int [numberColumns];
     336      for (int i=0;i<numberColumns;i++)
     337        usedColumn[i]=-1;
     338    }
    337339    lastSolution = CoinCopyOfArray(model_->solver()->getColSolution(),numberColumns);
    338340  }
Note: See TracChangeset for help on using the changeset viewer.