Ignore:
Timestamp:
Jul 25, 2007 11:54:56 AM (12 years ago)
Author:
forrest
Message:

take out };

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcBranchActual.hpp

    r640 r706  
    4646  /// Number of members
    4747  inline int numberMembers() const
    48   {return numberMembers_;};
     48  {return numberMembers_;}
    4949
    5050  /// Number of Non SOS members i.e. fixing to zero is strong
    5151  inline int numberNonSOSMembers() const
    52   {return numberNonSOSMembers_;};
     52  {return numberNonSOSMembers_;}
    5353
    5454  /// Members (indices in range 0 ... numberIntegers_-1)
    5555  inline const int * members() const
    56   {return members_;};
     56  {return members_;}
    5757
    5858  /** Type of each member i.e. which way is strong 0=non SOS, 1 =SOS,
    5959      index is 0 ... numberMembers_-1 */
    6060  inline const char type(int index) const
    61   {if (type_) return type_[index]; else return 1;};
     61  {if (type_) return type_[index]; else return 1;}
    6262
    6363  /// Clique type - 0 <=, 1 ==
    6464  inline int cliqueType() const
    65   {return cliqueType_;};
     65  {return cliqueType_;}
    6666  /// Redoes data when sequence numbers change
    6767  virtual void redoSequenceEtc(CbcModel * model, int numberColumns, const int * originalColumns);
     
    142142  /// Number of members
    143143  inline int numberMembers() const
    144   {return numberMembers_;};
     144  {return numberMembers_;}
    145145
    146146  /// Members (indices in range 0 ... numberColumns-1)
    147147  inline const int * members() const
    148   {return members_;};
     148  {return members_;}
    149149
    150150  /// SOS type
    151151  inline int sosType() const
    152   {return sosType_;};
     152  {return sosType_;}
    153153
    154154  /** Array of weights */
    155155  inline const double * weights() const
    156   { return weights_;};
     156  { return weights_;}
    157157
    158158  /** \brief Return true if object can take part in normal heuristics
    159159  */
    160160  virtual bool canDoHeuristics() const
    161   {return (sosType_==1&&integerValued_);};
     161  {return (sosType_==1&&integerValued_);}
    162162  /// Set whether set is integer valued or not
    163163  inline void setIntegerValued(bool yesNo)
    164   { integerValued_=yesNo;};
     164  { integerValued_=yesNo;}
    165165private:
    166166  /// data
     
    254254  /// Set column number
    255255  inline void setColumnNumber(int value)
    256   { columnNumber_ = value;};
     256  { columnNumber_ = value;}
    257257
    258258  /** Reset variable bounds to their original values.
     
    266266  /// Original bounds
    267267  inline double originalLowerBound() const
    268   { return originalLower_;};
     268  { return originalLower_;}
    269269  inline void setOriginalLowerBound(double value)
    270   { originalLower_=value;};
     270  { originalLower_=value;}
    271271  inline double originalUpperBound() const
    272   { return originalUpper_;};
     272  { return originalUpper_;}
    273273  inline void setOriginalUpperBound(double value)
    274   { originalUpper_=value;};
     274  { originalUpper_=value;}
    275275  /// Breakeven e.g 0.7 -> >= 0.7 go up first
    276276  inline double breakEven() const
    277   { return breakEven_;};
     277  { return breakEven_;}
    278278  /// Set breakeven e.g 0.7 -> >= 0.7 go up first
    279279  inline void setBreakEven(double value)
    280   { breakEven_=value;};
     280  { breakEven_=value;}
    281281
    282282
     
    340340  /// Number of members
    341341  inline int numberMembers() const
    342   {return numberMembers_;};
     342  {return numberMembers_;}
    343343
    344344  /// Members (indices in range 0 ... numberColumns-1)
    345345  inline const int * members() const
    346   {return members_;};
     346  {return members_;}
    347347  /// Redoes data when sequence numbers change
    348348  virtual void redoSequenceEtc(CbcModel * model, int numberColumns, const int * originalColumns);
     
    466466  /// Down pseudo cost
    467467  inline double downPseudoCost() const
    468   { return downPseudoCost_;};
     468  { return downPseudoCost_;}
    469469  /// Set down pseudo cost
    470470  inline void setDownPseudoCost(double value)
    471   { downPseudoCost_=value;};
     471  { downPseudoCost_=value;}
    472472
    473473  /// Up pseudo cost
    474474  inline double upPseudoCost() const
    475   { return upPseudoCost_;};
     475  { return upPseudoCost_;}
    476476  /// Set up pseudo cost
    477477  inline void setUpPseudoCost(double value)
    478   { upPseudoCost_=value;};
     478  { upPseudoCost_=value;}
    479479
    480480  /// Up down separator
    481481  inline double upDownSeparator() const
    482   { return upDownSeparator_;};
     482  { return upDownSeparator_;}
    483483  /// Set up down separator
    484484  inline void setUpDownSeparator(double value)
    485   { upDownSeparator_=value;};
     485  { upDownSeparator_=value;}
    486486
    487487  /// Return "up" estimate
     
    492492  /// method - see below for details
    493493  inline int method() const
    494   { return method_;};
     494  { return method_;}
    495495  /// Set method
    496496  inline void setMethod(int value)
    497   { method_=value;};
     497  { method_=value;}
    498498
    499499protected:
     
    576576  /// Change in guessed
    577577  inline double changeInGuessed() const
    578   { return changeInGuessed_;};
     578  { return changeInGuessed_;}
    579579  /// Set change in guessed
    580580  inline void setChangeInGuessed(double value)
    581   { changeInGuessed_=value;};
     581  { changeInGuessed_=value;}
    582582protected:
    583583  /// Change in guessed objective value for next branch
     
    759759  */
    760760  virtual int numberBranches() const
    761   {return numberInSet_;};
     761  {return numberInSet_;}
    762762  /// Is this a two way object (-1 down, +1 up)
    763763  virtual bool twoWay() const
    764   { return false;};
     764  { return false;}
    765765private:
    766766  /// order of branching - points back to CbcNWay
Note: See TracChangeset for help on using the changeset viewer.