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

    r2150 r2385  
    1010 */
    1111
    12 
    1312#ifndef ClpPEDualRowSteepest_H
    1413#define ClpPEDualRowSteepest_H
     
    1716#include "ClpPESimplex.hpp"
    1817class CoinIndexedVector;
    19 
    2018
    2119//#############################################################################
     
    3028
    3129public:
    32         /** Default Constructor
     30  /** Default Constructor
    3331         mode: 0 is uninitialized, 1 full, 2 is partial uninitialized,
    3432         3 starts as 2 but may switch to 1.
     
    3735         This can be faster on very easy problems.
    3836     */
    39         ClpPEDualRowSteepest(double psi = 0.5, int mode = 3);
     37  ClpPEDualRowSteepest(double psi = 0.5, int mode = 3);
    4038
    41         /// Copy constructor
    42         ClpPEDualRowSteepest(const ClpPEDualRowSteepest &);
     39  /// Copy constructor
     40  ClpPEDualRowSteepest(const ClpPEDualRowSteepest &);
    4341
    44         /// Assignment operator
    45         ClpPEDualRowSteepest & operator=(const ClpPEDualRowSteepest& rhs);
     42  /// Assignment operator
     43  ClpPEDualRowSteepest &operator=(const ClpPEDualRowSteepest &rhs);
    4644
    47         /// Destructor
    48         virtual ~ClpPEDualRowSteepest();
     45  /// Destructor
     46  virtual ~ClpPEDualRowSteepest();
    4947
    50         /// Clone
    51         virtual ClpDualRowPivot * clone(bool copyData = true) const;
     48  /// Clone
     49  virtual ClpDualRowPivot *clone(bool copyData = true) const;
    5250
    53  public:
    54         ///@name Algorithmic methods
    55      //@{
     51public:
     52  ///@name Algorithmic methods
     53  //@{
    5654
    57      /// Returns pivot row, -1 if none
    58      virtual int pivotRow();
     55  /// Returns pivot row, -1 if none
     56  virtual int pivotRow();
    5957
    60      /** Save weights - this may initialize weights as well
     58  /** Save weights - this may initialize weights as well
    6159         This is as parent but may initialize ClpPESimplex
    6260     */
    63      virtual void saveWeights(ClpSimplex * model, int mode);
    64      /** Updates primal solution (and maybe list of candidates)
     61  virtual void saveWeights(ClpSimplex *model, int mode);
     62  /** Updates primal solution (and maybe list of candidates)
    6563         Uses input vector which it deletes
    6664         Computes change in objective function
    6765         As ordinary steepest but checks for zero moves
    6866     */
    69      virtual void updatePrimalSolution(CoinIndexedVector * input,
    70                                        double theta,
    71                                        double & changeInObjective);
    72      //@}
     67  virtual void updatePrimalSolution(CoinIndexedVector *input,
     68    double theta,
     69    double &changeInObjective);
     70  //@}
    7371
    74      // Psi
    75      inline double psi() const
    76      { return psi_;}
     72  // Psi
     73  inline double psi() const
     74  {
     75    return psi_;
     76  }
    7777
    78      //---------------------------------------------------------------------------
     78  //---------------------------------------------------------------------------
    7979
    8080private:
    81     /* this PESimplex object is used to identify the compatible variables */
    82     ClpPESimplex *modelPE_;
     81  /* this PESimplex object is used to identify the compatible variables */
     82  ClpPESimplex *modelPE_;
    8383
    84     /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
     84  /* psi is the factor used in the bi-dimensional pricing, it is < 1 and
    8585       1/psi grows with the priority given to compatible variables */
    86     double psi_;
     86  double psi_;
    8787
    88     /* useful counters for the update of the set of compatible variables */
    89     int iCurrent_;
    90     int iInterval_;
     88  /* useful counters for the update of the set of compatible variables */
     89  int iCurrent_;
     90  int iInterval_;
    9191
    92     /* record if previous iterations concluded that compatibles should not be checked */
    93     bool updateCompatibles_;
    94     int coDegenCompatibles_, coConsecutiveCompatibles_;
    95 
     92  /* record if previous iterations concluded that compatibles should not be checked */
     93  bool updateCompatibles_;
     94  int coDegenCompatibles_, coConsecutiveCompatibles_;
    9695};
    9796
    9897#endif
     98
     99/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     100*/
Note: See TracChangeset for help on using the changeset viewer.