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

formatting

File:
1 edited

Legend:

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

    r2216 r2385  
    2121#include "ClpPESimplex.hpp"
    2222
    23 
    24 class ClpPEPrimalColumnDantzig : public ClpPrimalColumnDantzig{
     23class ClpPEPrimalColumnDantzig : public ClpPrimalColumnDantzig {
    2524
    2625public:
    27         /** constructors */
    28         ClpPEPrimalColumnDantzig(double psi = 0.5);
    29         ClpPEPrimalColumnDantzig(const ClpPEPrimalColumnDantzig &); //copy constructor
     26  /** constructors */
     27  ClpPEPrimalColumnDantzig(double psi = 0.5);
     28  ClpPEPrimalColumnDantzig(const ClpPEPrimalColumnDantzig &); //copy constructor
    3029
    31         /** destructor */
    32         ~ClpPEPrimalColumnDantzig();
     30  /** destructor */
     31  ~ClpPEPrimalColumnDantzig();
    3332
    34         /** assignment operator */
    35   ClpPEPrimalColumnDantzig & operator=(const ClpPEPrimalColumnDantzig& rhs);
    36        
    37         /** clone */
    38   ClpPrimalColumnPivot * clone(bool copyData = true) const;
    39        
    40         virtual int pivotColumn(CoinIndexedVector * updates,
    41                                                                         CoinIndexedVector * spareRow1,
    42                                                                         CoinIndexedVector * spareRow2,
    43                                                                         CoinIndexedVector * spareColumn1,
    44                                                                         CoinIndexedVector * spareColumn2);
    45        
    46      //@}
    47      /** Save weights - this may initialize weights as well
     33  /** assignment operator */
     34  ClpPEPrimalColumnDantzig &operator=(const ClpPEPrimalColumnDantzig &rhs);
     35
     36  /** clone */
     37  ClpPrimalColumnPivot *clone(bool copyData = true) const;
     38
     39  virtual int pivotColumn(CoinIndexedVector *updates,
     40    CoinIndexedVector *spareRow1,
     41    CoinIndexedVector *spareRow2,
     42    CoinIndexedVector *spareColumn1,
     43    CoinIndexedVector *spareColumn2);
     44
     45  //@}
     46  /** Save weights - this may initialize weights as well
    4847         This is as parent but may initialize ClpPESimplex
    4948     */
    50      virtual void saveWeights(ClpSimplex * model, int mode);
    51      //---------------------------------------------------------------------------
     49  virtual void saveWeights(ClpSimplex *model, int mode);
     50  //---------------------------------------------------------------------------
    5251private:
    53     /* this PESimplex object is used to identify the compatible variables */
    54     ClpPESimplex *modelPE_;
     52  /* this PESimplex object is used to identify the compatible variables */
     53  ClpPESimplex *modelPE_;
    5554
    56     /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
     55  /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
    5756       1/psi grows with the priority given to compatible variables */
    58     double psi_;
     57  double psi_;
    5958
    60     /* useful counters for the update of the set of compatible variables */
    61     int iCurrent_;
    62     int iInterval_;
     59  /* useful counters for the update of the set of compatible variables */
     60  int iCurrent_;
     61  int iInterval_;
    6362
    64     /* record if previous iterations concluded that compatibles should not be checked */
    65     int coDegenCompatibles_;
    66     int coConsecutiveCompatibles_;
    67     bool updateCompatibles_;
    68 
     63  /* record if previous iterations concluded that compatibles should not be checked */
     64  int coDegenCompatibles_;
     65  int coConsecutiveCompatibles_;
     66  bool updateCompatibles_;
    6967};
    7068#endif
     69
     70/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     71*/
Note: See TracChangeset for help on using the changeset viewer.