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

    r1665 r2385  
    1010
    1111#include "ClpInterior.hpp"
    12 
    1312
    1413/**
     
    7675class ClpLsqr {
    7776private:
    78      /**@name Private member data */
    79      //@{
    80      //@}
     77  /**@name Private member data */
     78  //@{
     79  //@}
    8180
    8281public:
    83      /**@name Public member data */
    84      //@{
    85      /// Row dimension of matrix
    86      int          nrows_;
    87      /// Column dimension of matrix
    88      int          ncols_;
    89      /// Pointer to Model object for this instance
    90      ClpInterior        *model_;
    91      /// Diagonal array 1
    92      double        *diag1_;
    93      /// Constant diagonal 2
    94      double        diag2_;
    95      //@}
     82  /**@name Public member data */
     83  //@{
     84  /// Row dimension of matrix
     85  int nrows_;
     86  /// Column dimension of matrix
     87  int ncols_;
     88  /// Pointer to Model object for this instance
     89  ClpInterior *model_;
     90  /// Diagonal array 1
     91  double *diag1_;
     92  /// Constant diagonal 2
     93  double diag2_;
     94  //@}
    9695
    97      /**@name Constructors and destructors */
    98      /** Default constructor */
    99      ClpLsqr();
     96  /**@name Constructors and destructors */
     97  /** Default constructor */
     98  ClpLsqr();
    10099
    101      /** Constructor for use with Pdco model (note modified for pdco!!!!) */
    102      ClpLsqr(ClpInterior *model);
    103      /// Copy constructor
    104      ClpLsqr(const ClpLsqr &);
    105      /// Assignment operator. This copies the data
    106      ClpLsqr & operator=(const ClpLsqr & rhs);
    107      /** Destructor */
    108      ~ClpLsqr();
    109      //@}
     100  /** Constructor for use with Pdco model (note modified for pdco!!!!) */
     101  ClpLsqr(ClpInterior *model);
     102  /// Copy constructor
     103  ClpLsqr(const ClpLsqr &);
     104  /// Assignment operator. This copies the data
     105  ClpLsqr &operator=(const ClpLsqr &rhs);
     106  /** Destructor */
     107  ~ClpLsqr();
     108  //@}
    110109
    111      /**@name Methods */
    112      //@{
    113      /// Set an int parameter
    114      bool setParam(char *parmName, int parmValue);
    115      /// Call the Lsqr algorithm
    116      void do_lsqr( CoinDenseVector<double> &b,
    117                    double damp, double atol, double btol, double conlim, int itnlim,
    118                    bool show, Info info, CoinDenseVector<double> &x , int *istop,
    119                    int *itn, Outfo *outfo, bool precon, CoinDenseVector<double> &Pr );
    120      /// Matrix-vector multiply - implemented by user
    121      void matVecMult( int, CoinDenseVector<double> *, CoinDenseVector<double> *);
     110  /**@name Methods */
     111  //@{
     112  /// Set an int parameter
     113  bool setParam(char *parmName, int parmValue);
     114  /// Call the Lsqr algorithm
     115  void do_lsqr(CoinDenseVector< double > &b,
     116    double damp, double atol, double btol, double conlim, int itnlim,
     117    bool show, Info info, CoinDenseVector< double > &x, int *istop,
     118    int *itn, Outfo *outfo, bool precon, CoinDenseVector< double > &Pr);
     119  /// Matrix-vector multiply - implemented by user
     120  void matVecMult(int, CoinDenseVector< double > *, CoinDenseVector< double > *);
    122121
    123      void matVecMult( int, CoinDenseVector<double> &, CoinDenseVector<double> &);
    124      /// diag1 - we just borrow as it is part of a CoinDenseVector<double>
    125      void borrowDiag1(double * array) {
    126           diag1_ = array;
    127      };
    128      //@}
     122  void matVecMult(int, CoinDenseVector< double > &, CoinDenseVector< double > &);
     123  /// diag1 - we just borrow as it is part of a CoinDenseVector<double>
     124  void borrowDiag1(double *array)
     125  {
     126    diag1_ = array;
     127  };
     128  //@}
    129129};
    130130#endif
    131131
    132 
    133 
    134 
     132/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     133*/
Note: See TracChangeset for help on using the changeset viewer.