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

    r1910 r2385  
    1818
    1919class AbcDualRowDantzig : public AbcDualRowPivot {
    20  
     20
    2121public:
    22  
    2322  ///@name Algorithmic methods
    2423  //@{
    25  
     24
    2625  /// Returns pivot row, -1 if none
    2726  virtual int pivotRow();
    28  
     27
    2928  /** Updates weights and returns pivot alpha.
    3029      Also does FT update */
    31   virtual double updateWeights(CoinIndexedVector & input,CoinIndexedVector & updatedColumn);
    32   virtual double updateWeights1(CoinIndexedVector & input,CoinIndexedVector & updateColumn);
     30  virtual double updateWeights(CoinIndexedVector &input, CoinIndexedVector &updatedColumn);
     31  virtual double updateWeights1(CoinIndexedVector &input, CoinIndexedVector &updateColumn);
    3332  virtual void updateWeightsOnly(CoinIndexedVector & /*input*/) {};
    3433  /// Actually updates weights
    35   virtual void updateWeights2(CoinIndexedVector & input,CoinIndexedVector & /*updateColumn*/) {input.clear();};
     34  virtual void updateWeights2(CoinIndexedVector &input, CoinIndexedVector & /*updateColumn*/) { input.clear(); };
    3635  /** Updates primal solution (and maybe list of candidates)
    3736      Uses input vector which it deletes
    3837      Computes change in objective function
    3938  */
    40   virtual void updatePrimalSolution(CoinIndexedVector & input,
    41                                     double theta);
     39  virtual void updatePrimalSolution(CoinIndexedVector &input,
     40    double theta);
    4241  /** Saves any weights round factorization as pivot rows may change
    4342      Will be empty unless steepest edge (will save model)
     
    5049      5) for strong branching - initialize  , infeasibilities
    5150  */
    52   virtual void saveWeights(AbcSimplex * model, int mode);
     51  virtual void saveWeights(AbcSimplex *model, int mode);
    5352  /// Recompute infeasibilities
    5453  virtual void recomputeInfeasibilities();
    5554  //@}
    56  
    57  
     55
    5856  ///@name Constructors and destructors
    5957  //@{
    6058  /// Default Constructor
    6159  AbcDualRowDantzig();
    62  
     60
    6361  /// Copy constructor
    6462  AbcDualRowDantzig(const AbcDualRowDantzig &);
    65  
     63
    6664  /// Assignment operator
    67   AbcDualRowDantzig & operator=(const AbcDualRowDantzig& rhs);
    68  
     65  AbcDualRowDantzig &operator=(const AbcDualRowDantzig &rhs);
     66
    6967  /// Destructor
    70   virtual ~AbcDualRowDantzig ();
    71  
     68  virtual ~AbcDualRowDantzig();
     69
    7270  /// Clone
    73   virtual AbcDualRowPivot * clone(bool copyData = true) const;
    74  
     71  virtual AbcDualRowPivot *clone(bool copyData = true) const;
     72
    7573  //@}
    76  
     74
    7775  //---------------------------------------------------------------------------
    78  
     76
    7977private:
    8078  ///@name Private member data
    8179  /// infeasibility array (just for infeasible rows)
    82   CoinIndexedVector * infeasible_;
     80  CoinIndexedVector *infeasible_;
    8381  //@}
    8482};
    8583
    8684#endif
     85
     86/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     87*/
Note: See TracChangeset for help on using the changeset viewer.