Changeset 2421


Ignore:
Timestamp:
Nov 16, 2018 11:12:56 AM (8 months ago)
Author:
forrest
Message:

I am a stupid idiot id_ was in so don't need setNumber_

Location:
trunk/Cbc/src
Files:
3 edited

Legend:

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

    r2420 r2421  
    4141          numberMembers_(0),
    4242          sosType_(-1),
    43 #ifdef CBC_INVESTIGATE_SOS
    44           setNumber_(-1),
    45 #endif
    4643          integerValued_(false),
    4744          oddValues_(false)
     
    6158        numberMembers_(numberMembers),
    6259          sosType_(type),
    63 #ifdef CBC_INVESTIGATE_SOS
    64           setNumber_(-1),
    65 #endif
    6660          oddValues_(false)
    6761{
     
    133127    numberMembers_ = rhs.numberMembers_;
    134128    sosType_ = rhs.sosType_;
    135 #ifdef CBC_INVESTIGATE_SOS
    136     setNumber_ = rhs.setNumber_;
    137 #endif
    138129    integerValued_ = rhs.integerValued_;
    139130    oddValues_ = rhs.oddValues_;
     
    172163        numberMembers_ = rhs.numberMembers_;
    173164        sosType_ = rhs.sosType_;
    174 #ifdef CBC_INVESTIGATE_SOS
    175         setNumber_ = rhs.setNumber_;
    176 #endif
    177165        integerValued_ = rhs.integerValued_;
    178166        oddValues_ = rhs.oddValues_;
     
    909897    const double * solution = solver->getColSolution();
    910898    printf("Set %d type %d way %d range %g -> %g (%d inset) separator %g tozero ",
    911            set_->whichSet(),set_->sosType(),way_,
     899           set_->id(),set_->sosType(),way_,
    912900           weights[0],weights[numberMembers-1],numberMembers,separator_);
    913901#endif
  • trunk/Cbc/src/CbcSOS.hpp

    r2419 r2421  
    106106        return sosType_;
    107107    }
    108 #ifdef CBC_INVESTIGATE_SOS
    109     /// Set which Set
    110     inline void setSet(int number) {
    111       setNumber_=number;
    112     }
    113     /// Which set
    114     inline int whichSet() const {
    115       return setNumber_;
    116     }
    117 #endif
    118108    /// Down number times
    119109    inline int numberTimesDown() const {
     
    188178    /// SOS type
    189179    int sosType_;
    190 #ifdef CBC_INVESTIGATE_SOS
    191     /// Which set
    192     int setNumber_;
    193 #endif
    194180    /// Whether integer valued
    195181    bool integerValued_;
  • trunk/Cbc/src/CbcSolver.cpp

    r2419 r2421  
    60866086                                                CbcSOS * sosObject = new CbcSOS(babModel_, n, sosIndices + iStart, sosReference + iStart,
    60876087                                                                           iSOS, sosType[iSOS]);
    6088 #ifdef CBC_INVESTIGATE_SOS
    6089                                                 sosObject->setSet(iSOS);
    6090 #endif
    60916088                                                if (sosPriority) {
    60926089                                                    sosObject->setPriority(sosPriority[iSOS]);
Note: See TracChangeset for help on using the changeset viewer.