Ignore:
Timestamp:
Sep 15, 2006 4:55:05 PM (13 years ago)
Author:
forrest
Message:

many changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcBranchActual.cpp

    r416 r424  
    338338    weights_(NULL),
    339339    numberMembers_(0),
    340     sosType_(-1)
     340    sosType_(-1),
     341    integerValued_(false)
    341342{
    342343}
     
    350351{
    351352  id_=identifier;
     353  integerValued_ = type==1;
    352354  if (numberMembers_) {
    353355    members_ = new int[numberMembers_];
     
    362364    // sort so weights increasing
    363365    CoinSort_2(weights_,weights_+numberMembers_,members_);
     366    double last = -COIN_DBL_MAX;
     367    int i;
     368    for (i=0;i<numberMembers_;i++) {
     369      double possible = CoinMax(last+1.0e-10,weights_[i]);
     370      weights_[i] = possible;
     371      last=possible;
     372    }
    364373  } else {
    365374    members_ = NULL;
     
    375384  numberMembers_ = rhs.numberMembers_;
    376385  sosType_ = rhs.sosType_;
     386  integerValued_ = rhs.integerValued_;
    377387  if (numberMembers_) {
    378388    members_ = new int[numberMembers_];
     
    403413    numberMembers_ = rhs.numberMembers_;
    404414    sosType_ = rhs.sosType_;
     415    integerValued_ = rhs.integerValued_;
    405416    if (numberMembers_) {
    406417      members_ = new int[numberMembers_];
Note: See TracChangeset for help on using the changeset viewer.