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

    r1910 r2385  
    1010class CoinIndexedVector;
    1111
    12 
    1312//#############################################################################
    1413
     
    2019
    2120class AbcDualRowSteepest : public AbcDualRowPivot {
    22  
     21
    2322public:
    24  
    2523  ///@name Algorithmic methods
    2624  //@{
    27  
     25
    2826  /// Returns pivot row, -1 if none
    2927  virtual int pivotRow();
    30  
     28
    3129  /** Updates weights and returns pivot alpha.
    3230      Also does FT update */
    33   virtual double updateWeights(CoinIndexedVector & input,CoinIndexedVector & updatedColumn);
    34   virtual double updateWeights1(CoinIndexedVector & input,CoinIndexedVector & updateColumn);
    35   virtual void updateWeightsOnly(CoinIndexedVector & input);
     31  virtual double updateWeights(CoinIndexedVector &input, CoinIndexedVector &updatedColumn);
     32  virtual double updateWeights1(CoinIndexedVector &input, CoinIndexedVector &updateColumn);
     33  virtual void updateWeightsOnly(CoinIndexedVector &input);
    3634  /// Actually updates weights
    37   virtual void updateWeights2(CoinIndexedVector & input,CoinIndexedVector & updateColumn);
    38  
     35  virtual void updateWeights2(CoinIndexedVector &input, CoinIndexedVector &updateColumn);
     36
    3937  /** Updates primal solution (and maybe list of candidates)
    4038      Uses input vector which it deletes
    4139  */
    42   virtual void updatePrimalSolution(CoinIndexedVector & input,
    43                                     double theta);
    44  
    45   virtual void updatePrimalSolutionAndWeights(CoinIndexedVector & weightsVector,
    46                                               CoinIndexedVector & updateColumn,
    47                                               double theta);
     40  virtual void updatePrimalSolution(CoinIndexedVector &input,
     41    double theta);
     42
     43  virtual void updatePrimalSolutionAndWeights(CoinIndexedVector &weightsVector,
     44    CoinIndexedVector &updateColumn,
     45    double theta);
    4846  /** Saves any weights round factorization as pivot rows may change
    4947      Save model
     
    5654      5) for strong branching - initialize (uninitialized) , infeasibilities
    5755  */
    58   virtual void saveWeights(AbcSimplex * model, int mode);
     56  virtual void saveWeights(AbcSimplex *model, int mode);
    5957  /// Recompute infeasibilities
    6058  virtual void recomputeInfeasibilities();
     
    6462  virtual bool looksOptimal() const;
    6563  //@}
    66  
     64
    6765  /** enums for persistence
    6866   */
     
    7169    keep = 0x01 // create (if necessary) and leave
    7270  };
    73  
     71
    7472  ///@name Constructors and destructors
    7573  //@{
     
    8280  */
    8381  AbcDualRowSteepest(int mode = 3);
    84  
     82
    8583  /// Copy constructor
    8684  AbcDualRowSteepest(const AbcDualRowSteepest &);
    87  
     85
    8886  /// Assignment operator
    89   AbcDualRowSteepest & operator=(const AbcDualRowSteepest& rhs);
    90  
     87  AbcDualRowSteepest &operator=(const AbcDualRowSteepest &rhs);
     88
    9189  /// Fill most values
    92   void fill(const AbcDualRowSteepest& rhs);
    93  
     90  void fill(const AbcDualRowSteepest &rhs);
     91
    9492  /// Destructor
    95   virtual ~AbcDualRowSteepest ();
    96  
     93  virtual ~AbcDualRowSteepest();
     94
    9795  /// Clone
    98   virtual AbcDualRowPivot * clone(bool copyData = true) const;
    99  
     96  virtual AbcDualRowPivot *clone(bool copyData = true) const;
     97
    10098  //@}
    10199  /**@name gets and sets */
    102100  //@{
    103101  /// Mode
    104   inline int mode() const {
     102  inline int mode() const
     103  {
    105104    return mode_;
    106105  }
    107106  /// Set/ get persistence
    108   inline void setPersistence(Persistence life) {
     107  inline void setPersistence(Persistence life)
     108  {
    109109    persistence_ = life;
    110110  }
    111   inline Persistence persistence() const {
    112     return persistence_ ;
     111  inline Persistence persistence() const
     112  {
     113    return persistence_;
    113114  }
    114115  /// Infeasible vector
    115   inline CoinIndexedVector * infeasible() const
    116   { return infeasible_;}
     116  inline CoinIndexedVector *infeasible() const
     117  {
     118    return infeasible_;
     119  }
    117120  /// Weights vector
    118   inline CoinIndexedVector * weights() const
    119   { return weights_;}
     121  inline CoinIndexedVector *weights() const
     122  {
     123    return weights_;
     124  }
    120125  /// Model
    121   inline AbcSimplex * model() const
    122   { return model_;}
     126  inline AbcSimplex *model() const
     127  {
     128    return model_;
     129  }
    123130  //@}
    124  
     131
    125132  //---------------------------------------------------------------------------
    126  
     133
    127134private:
    128135  ///@name Private member data
     
    143150  Persistence persistence_;
    144151  /// weight array
    145   CoinIndexedVector * weights_;
     152  CoinIndexedVector *weights_;
    146153  /// square of infeasibility array (just for infeasible rows)
    147   CoinIndexedVector * infeasible_;
     154  CoinIndexedVector *infeasible_;
    148155  /// save weight array (so we can use checkpoint)
    149   CoinIndexedVector * savedWeights_;
     156  CoinIndexedVector *savedWeights_;
    150157  //@}
    151158};
     
    156163#define DEVEX_ADD_ONE 1.0
    157164#endif
     165
     166/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     167*/
Note: See TracChangeset for help on using the changeset viewer.