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

    r1910 r2385  
    2121*/
    2222
    23 class AbcDualRowPivot  {
    24  
     23class AbcDualRowPivot {
     24
    2525public:
    26  
    2726  ///@name Algorithmic methods
    2827  //@{
    29  
     28
    3029  /// Returns pivot row, -1 if none
    3130  virtual int pivotRow() = 0;
    32  
     31
    3332  /** Does most of work for weights and returns pivot alpha.
    3433      Also does FT update */
    35   virtual double updateWeights1(CoinIndexedVector & input,CoinIndexedVector & updateColumn) = 0;
    36   virtual void updateWeightsOnly(CoinIndexedVector & input) = 0;
    37   virtual double updateWeights(CoinIndexedVector & input,CoinIndexedVector & updateColumn) = 0;
     34  virtual double updateWeights1(CoinIndexedVector &input, CoinIndexedVector &updateColumn) = 0;
     35  virtual void updateWeightsOnly(CoinIndexedVector &input) = 0;
     36  virtual double updateWeights(CoinIndexedVector &input, CoinIndexedVector &updateColumn) = 0;
    3837  /// Actually updates weights
    39   virtual void updateWeights2(CoinIndexedVector & input,CoinIndexedVector & updateColumn) = 0;
    40  
     38  virtual void updateWeights2(CoinIndexedVector &input, CoinIndexedVector &updateColumn) = 0;
     39
    4140  /** Updates primal solution (and maybe list of candidates)
    4241      Uses input vector which it deletes
     
    4443      means everything is always in sync
    4544  */
    46   virtual void updatePrimalSolution(CoinIndexedVector & updateColumn,
    47                                     double theta) = 0;
    48   virtual void updatePrimalSolutionAndWeights(CoinIndexedVector & weightsVector,
    49                                     CoinIndexedVector & updateColumn,
    50                                               double theta);
     45  virtual void updatePrimalSolution(CoinIndexedVector &updateColumn,
     46    double theta)
     47    = 0;
     48  virtual void updatePrimalSolutionAndWeights(CoinIndexedVector &weightsVector,
     49    CoinIndexedVector &updateColumn,
     50    double theta);
    5151  /** Saves any weights round factorization as pivot rows may change
    5252      Will be empty unless steepest edge (will save model)
     
    5959      5) for strong branching - initialize  , infeasibilities
    6060  */
    61   virtual void saveWeights(AbcSimplex * model, int mode);
     61  virtual void saveWeights(AbcSimplex *model, int mode);
    6262  /// Recompute infeasibilities
    6363  virtual void recomputeInfeasibilities();
     
    6767  virtual void clearArrays();
    6868  /// Returns true if would not find any row
    69   virtual bool looksOptimal() const {
     69  virtual bool looksOptimal() const
     70  {
    7071    return false;
    7172  }
    7273  //@}
    73  
    74  
     74
    7575  ///@name Constructors and destructors
    7676  //@{
    7777  /// Default Constructor
    7878  AbcDualRowPivot();
    79  
     79
    8080  /// Copy constructor
    8181  AbcDualRowPivot(const AbcDualRowPivot &);
    82  
     82
    8383  /// Assignment operator
    84   AbcDualRowPivot & operator=(const AbcDualRowPivot& rhs);
    85  
     84  AbcDualRowPivot &operator=(const AbcDualRowPivot &rhs);
     85
    8686  /// Destructor
    87   virtual ~AbcDualRowPivot ();
    88  
     87  virtual ~AbcDualRowPivot();
     88
    8989  /// Clone
    90   virtual AbcDualRowPivot * clone(bool copyData = true) const = 0;
    91  
     90  virtual AbcDualRowPivot *clone(bool copyData = true) const = 0;
     91
    9292  //@}
    93  
     93
    9494  ///@name Other
    9595  //@{
    9696  /// Returns model
    97   inline AbcSimplex * model() {
     97  inline AbcSimplex *model()
     98  {
    9899    return model_;
    99100  }
    100  
     101
    101102  /// Sets model (normally to NULL)
    102   inline void setModel(AbcSimplex * newmodel) {
     103  inline void setModel(AbcSimplex *newmodel)
     104  {
    103105    model_ = newmodel;
    104106  }
    105  
     107
    106108  /// Returns type (above 63 is extra information)
    107   inline int type() {
     109  inline int type()
     110  {
    108111    return type_;
    109112  }
    110  
     113
    111114  //@}
    112  
     115
    113116  //---------------------------------------------------------------------------
    114  
     117
    115118protected:
    116119  ///@name Protected member data
    117120  //@{
    118121  /// Pointer to model
    119   AbcSimplex * model_;
     122  AbcSimplex *model_;
    120123  /// Type of row pivot algorithm
    121124  int type_;
     
    126129#endif
    127130#endif
     131
     132/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     133*/
Note: See TracChangeset for help on using the changeset viewer.