Ignore:
Timestamp:
Jan 6, 2019 2:43:06 PM (4 months ago)
Author:
unxusr
Message:

formatting

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpPEDualRowDantzig.hpp

    r2216 r2385  
    2323#include "ClpPESimplex.hpp"
    2424
    25 
    26 class ClpPEDualRowDantzig : public ClpDualRowDantzig{
     25class ClpPEDualRowDantzig : public ClpDualRowDantzig {
    2726
    2827public:
    29         /// Default Constructor
    30         ClpPEDualRowDantzig(double psi=0.5);
     28  /// Default Constructor
     29  ClpPEDualRowDantzig(double psi = 0.5);
    3130
    32         /// Copy constructor
    33         ClpPEDualRowDantzig(const ClpPEDualRowDantzig &);
     31  /// Copy constructor
     32  ClpPEDualRowDantzig(const ClpPEDualRowDantzig &);
    3433
    35         /// Assignment operator
    36         ClpPEDualRowDantzig & operator=(const ClpPEDualRowDantzig& rhs);
     34  /// Assignment operator
     35  ClpPEDualRowDantzig &operator=(const ClpPEDualRowDantzig &rhs);
    3736
    38         /// Destructor
    39         virtual ~ClpPEDualRowDantzig ();
     37  /// Destructor
     38  virtual ~ClpPEDualRowDantzig();
    4039
    41         /// Clone
    42         virtual ClpDualRowPivot * clone(bool copyData = true) const;
     40  /// Clone
     41  virtual ClpDualRowPivot *clone(bool copyData = true) const;
    4342
    44  public:
    45         ///@name Algorithmic methods
    46      //@{
     43public:
     44  ///@name Algorithmic methods
     45  //@{
    4746
    48      /// Returns pivot row, -1 if none
    49      virtual int pivotRow();
     47  /// Returns pivot row, -1 if none
     48  virtual int pivotRow();
    5049
    51     /// Update the compatible variables and
    52     /// call the base class method to update weights
    53     virtual double updateWeights(CoinIndexedVector * input,
    54                                  CoinIndexedVector * spare,
    55                                  CoinIndexedVector * spare2,
    56                                  CoinIndexedVector * updatedColumn);
     50  /// Update the compatible variables and
     51  /// call the base class method to update weights
     52  virtual double updateWeights(CoinIndexedVector *input,
     53    CoinIndexedVector *spare,
     54    CoinIndexedVector *spare2,
     55    CoinIndexedVector *updatedColumn);
    5756
    58      /** Save weights - this may initialize weights as well
     57  /** Save weights - this may initialize weights as well
    5958         This is as parent but may initialize ClpPESimplex
    6059     */
    61      virtual void saveWeights(ClpSimplex * model, int mode);
    62      //@}
     60  virtual void saveWeights(ClpSimplex *model, int mode);
     61  //@}
    6362
    64 
    65 
    66      //---------------------------------------------------------------------------
     63  //---------------------------------------------------------------------------
    6764
    6865private:
    69     /* this PESimplex object is used to identify the compatible variables */
    70     ClpPESimplex *modelPE_;
     66  /* this PESimplex object is used to identify the compatible variables */
     67  ClpPESimplex *modelPE_;
    7168
    72     /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
     69  /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
    7370       1/psi grows with the priority given to compatible variables */
    74     double psi_;
     71  double psi_;
    7572
    76     /* useful counters for the update of the set of compatible variables */
    77     int iCurrent_;
    78     int iInterval_;
     73  /* useful counters for the update of the set of compatible variables */
     74  int iCurrent_;
     75  int iInterval_;
    7976
    80     /* record if previous iterations concluded that compatibles should not be checked */
    81     bool updateCompatibles_;
    82     int coDegenCompatibles_, coConsecutiveCompatibles_;
     77  /* record if previous iterations concluded that compatibles should not be checked */
     78  bool updateCompatibles_;
     79  int coDegenCompatibles_, coConsecutiveCompatibles_;
    8380};
    8481#endif
     82
     83/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     84*/
Note: See TracChangeset for help on using the changeset viewer.