Ignore:
Timestamp:
Nov 5, 2002 1:04:44 AM (18 years ago)
Author:
ladanyi
Message:

devel-1 merged into HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/ClpPackedMatrix.hpp

    r2 r50  
    2222  /**@name Useful methods */
    2323   //@{
    24    /// Return a complete OsiPackedMatrix
    25   virtual OsiPackedMatrix * getPackedMatrix() const { return matrix_;};
     24   /// Return a complete CoinPackedMatrix
     25  virtual CoinPackedMatrix * getPackedMatrix() const { return matrix_;};
    2626    /** Whether the packed matrix is column major ordered or not. */
    2727    virtual bool isColOrdered() const { return matrix_->isColOrdered(); }
    2828   /** Number of entries in the packed matrix. */
    29   virtual  int getNumElements() const { return matrix_->getNumElements(); }
     29  virtual  CoinBigIndex getNumElements() const
     30  { return matrix_->getNumElements(); }
    3031   /** Number of columns. */
    3132   virtual int getNumCols() const { return matrix_->getNumCols(); }
     
    4748  { return matrix_->getIndices();};
    4849
    49    virtual const int * getVectorStarts() const
     50   virtual const CoinBigIndex * getVectorStarts() const
    5051  { return matrix_->getVectorStarts();};
    5152   /** The lengths of the major-dimension vectors. */
     
    7071  /** Returns number of elements in basis
    7172      column is basic if entry >=0 */
    72   virtual OsiBigIndex numberInBasis(const int * columnIsBasic) const ;
     73  virtual CoinBigIndex numberInBasis(const int * columnIsBasic) const ;
    7374  /// Fills in basis (Returns number of elements and updates numberBasic)
    74   virtual OsiBigIndex fillBasis(const ClpSimplex * model,
     75  virtual CoinBigIndex fillBasis(const ClpSimplex * model,
    7576                                const int * columnIsBasic, int & numberBasic,
    7677                                int * row, int * column,
     
    7980      returns non-zero if no scaling done */
    8081  virtual int scale(ClpSimplex * model) const ;
    81   /** Unpacks a column into an OsiIndexedvector
     82  /// Creates row copy and scales if necessary
     83  virtual ClpMatrixBase * scaledRowCopy(ClpSimplex * model) const;
     84  /** Checks if all elements are in valid range.  Can just
     85      return true if you are not paranoid.  For Clp I will
     86      probably expect no zeros.  Code can modify matrix to get rid of
     87      small elements.
     88  */
     89  virtual bool allElementsInRange(ClpSimplex * model,
     90                                  double smallest, double largest);
     91
     92  /** Unpacks a column into an CoinIndexedvector
    8293      Note that model is NOT const.  Bounds and objective could
    8394      be modified if doing column generation */
    84   virtual void unpack(ClpSimplex * model,OsiIndexedVector * rowArray,
     95  virtual void unpack(ClpSimplex * model,CoinIndexedVector * rowArray,
    8596                   int column) const ;
    86   /** Adds multiple of a column into an OsiIndexedvector
     97  /** Adds multiple of a column into an CoinIndexedvector
    8798      You can use quickAdd to add to vector */
    88   virtual void add(const ClpSimplex * model,OsiIndexedVector * rowArray,
     99  virtual void add(const ClpSimplex * model,CoinIndexedVector * rowArray,
    89100                   int column, double multiplier) const ;
    90    /// Allow any parts of a created OsiPackedMatrix to be deleted
     101   /// Allow any parts of a created CoinPackedMatrix to be deleted
    91102   virtual void releasePackedMatrix() const { };
    92103   //@}
     
    118129        Squashes small elements and knows about ClpSimplex */
    119130  virtual void transposeTimes(const ClpSimplex * model, double scalar,
    120                               const OsiIndexedVector * x,
    121                               OsiIndexedVector * y,
    122                               OsiIndexedVector * z) const;
     131                              const CoinIndexedVector * x,
     132                              CoinIndexedVector * y,
     133                              CoinIndexedVector * z) const;
    123134    /** Return <code>x *A in <code>z</code> but
    124135        just for indices in y.
    125136        Squashes small elements and knows about ClpSimplex */
    126137  virtual void subsetTransposeTimes(const ClpSimplex * model,
    127                               const OsiIndexedVector * x,
    128                               const OsiIndexedVector * y,
    129                               OsiIndexedVector * z) const;
     138                              const CoinIndexedVector * x,
     139                              const CoinIndexedVector * y,
     140                              CoinIndexedVector * z) const;
    130141  //@}
    131142
    132143  /**@name Other */
    133144   //@{
    134   /// Returns OsiPackedMatrix (non const)
    135   inline OsiPackedMatrix * matrix() const { return matrix_;};
     145  /// Returns CoinPackedMatrix (non const)
     146  inline CoinPackedMatrix * matrix() const { return matrix_;};
    136147   //@}
    137148
     
    149160   /** The copy constructor. */
    150161   ClpPackedMatrix(const ClpPackedMatrix&);
    151    /** The copy constructor from an OsiPackedMatrix. */
    152    ClpPackedMatrix(const OsiPackedMatrix&);
     162   /** The copy constructor from an CoinPackedMatrix. */
     163   ClpPackedMatrix(const CoinPackedMatrix&);
     164
     165  /** This takes over ownership (for space reasons) */
     166   ClpPackedMatrix(CoinPackedMatrix * matrix);
    153167
    154168   ClpPackedMatrix& operator=(const ClpPackedMatrix&);
     
    163177   //@{
    164178  /// Data
    165   OsiPackedMatrix * matrix_;
     179  CoinPackedMatrix * matrix_;
    166180   //@}
    167181};
Note: See TracChangeset for help on using the changeset viewer.