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/ClpPEPrimalColumnSteepest.hpp

    r2150 r2385  
    99
    1010 */
    11 
    1211
    1312#ifndef ClpPEPrimalColumnSteepest_H
     
    2221class CoinIndexedVector;
    2322
    24 
    2523/** Primal Column Pivot Steepest Edge Algorithm Class
    2624
     
    2927*/
    3028
    31 
    3229class ClpPEPrimalColumnSteepest : public ClpPrimalColumnSteepest {
    3330public:
    34 
    35     ///@name Constructors and destructors
    36      //@{
    37      /** Default Constructor
     31  ///@name Constructors and destructors
     32  //@{
     33  /** Default Constructor
    3834         0 is exact devex, 1 full steepest, 2 is partial exact devex
    3935         3 switches between 0 and 2 depending on factorization
     
    4339         This can be faster on very easy problems.
    4440     */
    45      ClpPEPrimalColumnSteepest(double psi = 0.5, int mode = 3);
     41  ClpPEPrimalColumnSteepest(double psi = 0.5, int mode = 3);
    4642
    47      /// Copy constructor
    48      ClpPEPrimalColumnSteepest(const ClpPEPrimalColumnSteepest & rhs);
     43  /// Copy constructor
     44  ClpPEPrimalColumnSteepest(const ClpPEPrimalColumnSteepest &rhs);
    4945
    50      /// Assignment operator
    51      ClpPEPrimalColumnSteepest & operator=(const ClpPEPrimalColumnSteepest& rhs);
     46  /// Assignment operator
     47  ClpPEPrimalColumnSteepest &operator=(const ClpPEPrimalColumnSteepest &rhs);
    5248
    53      /// Destructor
    54      virtual ~ClpPEPrimalColumnSteepest ();
     49  /// Destructor
     50  virtual ~ClpPEPrimalColumnSteepest();
    5551
    56      /// Clone
    57      virtual ClpPrimalColumnPivot * clone(bool copyData = true) const;
     52  /// Clone
     53  virtual ClpPrimalColumnPivot *clone(bool copyData = true) const;
    5854
    5955public:
     56  ///@name Algorithmic methods
     57  //@{
    6058
    61      ///@name Algorithmic methods
    62      //@{
    63 
    64      /** Returns pivot column, -1 if none.
     59  /** Returns pivot column, -1 if none.
    6560         The Packed CoinIndexedVector updates has cost updates - for normal LP
    6661         that is just +-weight where a feasibility changed.  It also has
     
    6964         profiling and speed
    7065     */
    71      virtual int pivotColumn(CoinIndexedVector * updates,
    72                              CoinIndexedVector * spareRow1,
    73                              CoinIndexedVector * spareRow2,
    74                              CoinIndexedVector * spareColumn1,
    75                              CoinIndexedVector * spareColumn2);
     66  virtual int pivotColumn(CoinIndexedVector *updates,
     67    CoinIndexedVector *spareRow1,
     68    CoinIndexedVector *spareRow2,
     69    CoinIndexedVector *spareColumn1,
     70    CoinIndexedVector *spareColumn2);
    7671
    77      //@}
    78      /** Save weights - this may initialize weights as well
     72  //@}
     73  /** Save weights - this may initialize weights as well
    7974         This is as parent but may initialize ClpPESimplex
    8075     */
    81      virtual void saveWeights(ClpSimplex * model, int mode);
    82      /// Updates weights - as ordinary but checks for zero moves
    83      virtual void updateWeights(CoinIndexedVector * input);
    84      //---------------------------------------------------------------------------
    85      // Psi
    86      inline double psi() const
    87      { return psi_;}
     76  virtual void saveWeights(ClpSimplex *model, int mode);
     77  /// Updates weights - as ordinary but checks for zero moves
     78  virtual void updateWeights(CoinIndexedVector *input);
     79  //---------------------------------------------------------------------------
     80  // Psi
     81  inline double psi() const
     82  {
     83    return psi_;
     84  }
    8885
    8986private:
    90     /* this PESimplex object is used to identify the compatible variables */
    91     ClpPESimplex *modelPE_;
     87  /* this PESimplex object is used to identify the compatible variables */
     88  ClpPESimplex *modelPE_;
    9289
    93     /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
     90  /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
    9491       1/psi grows with the priority given to compatible variables */
    95     double psi_;
     92  double psi_;
    9693
    97     /* useful counters for the update of the set of compatible variables */
    98     int iCurrent_;
    99     int iInterval_;
     94  /* useful counters for the update of the set of compatible variables */
     95  int iCurrent_;
     96  int iInterval_;
    10097
    101     /* record if previous iterations concluded that compatibles should not be checked */
    102     int coDegenCompatibles_;
    103     int coConsecutiveCompatibles_;
    104     bool updateCompatibles_;
     98  /* record if previous iterations concluded that compatibles should not be checked */
     99  int coDegenCompatibles_;
     100  int coConsecutiveCompatibles_;
     101  bool updateCompatibles_;
    105102};
    106103
    107104#endif
     105
     106/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     107*/
Note: See TracChangeset for help on using the changeset viewer.