Deprecate begin/end methods of matrix classes

include/cantera/base/Array.h

@@ -35,13 +35,15 @@ class Array2D
     //! types.
     /*!
      * This is just equal to vector<double>::iterator.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     typedef vector<double>::iterator iterator;
 
     //! Type definition for the const_iterator class that is can be used by
     //! Array2D types.
     /*!
      * This is just equal to vector<double>::const_iterator.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     typedef vector<double>::const_iterator const_iterator;
 
@@ -197,24 +199,20 @@ class Array2D
     }
 
     //! Return an iterator pointing to the first element
-    iterator begin() {
-        return m_data.begin();
-    }
+    //! @deprecated Unused. To be removed after %Cantera 3.0.
+    iterator begin();
 
     //! Return an iterator pointing past the last element
-    iterator end() {
-        return m_data.end();
-    }
+    //! @deprecated Unused. To be removed after %Cantera 3.0.
+    iterator end();
 
     //! Return a const iterator pointing to the first element
-    const_iterator begin() const {
-        return m_data.begin();
-    }
+    //! @deprecated Unused. To be removed after %Cantera 3.0.
+    const_iterator begin() const;
 
     //! Return a const iterator pointing to past the last element
-    const_iterator end() const {
-        return m_data.end();
-    }
+    //! @deprecated Unused. To be removed after %Cantera 3.0.
+    const_iterator end() const;
 
     //! Return a reference to the data vector
     vector<double>& data() {
@@ -226,6 +224,8 @@ class Array2D
         return m_data;
     }
 
+    void operator*=(double a);
+
     //! Return a pointer to the top of column j, columns are contiguous
     //! in memory
     /*!

include/cantera/numerics/BandMatrix.h

@@ -167,24 +167,28 @@ class BandMatrix : public GeneralMatrix
     //! Returns an iterator for the start of the band storage data
     /*!
      * Iterator points to the beginning of the data, and it is changeable.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     virtual vector<double>::iterator begin();
 
     //! Returns an iterator for the end of the band storage data
     /*!
      * Iterator points to the end of the data, and it is changeable.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     vector<double>::iterator end();
 
     //! Returns a const iterator for the start of the band storage data
     /*!
      * Iterator points to the beginning of the data, and it is not changeable.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     vector<double>::const_iterator begin() const;
 
     //! Returns a const iterator for the end of the band storage data
     /*!
      * Iterator points to the end of the data, and it is not changeable.
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     vector<double>::const_iterator end() const;
 

include/cantera/numerics/GeneralMatrix.h

@@ -143,13 +143,13 @@ class GeneralMatrix
 
     //! Return an iterator pointing to the first element
     /*!
-     * We might drop this later
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     virtual vector<double>::iterator begin() = 0;
 
     //! Return a const iterator pointing to the first element
     /*!
-     * We might drop this later
+     * @deprecated Unused. To be removed after %Cantera 3.0.
      */
     virtual vector<double>::const_iterator begin() const = 0;
 

src/base/Array.cpp

@@ -7,6 +7,7 @@
 
 #include "cantera/base/Array.h"
 #include "cantera/base/utilities.h"
+#include "cantera/base/global.h"
 
 namespace Cantera
 {
@@ -96,6 +97,25 @@ void Array2D::getColumn(size_t m, double* const col)
     }
 }
 
+Array2D::iterator Array2D::begin() {
+    warn_deprecated("Array2D::begin", "To be removed after Cantera 3.0.");
+    return m_data.begin();
+}
+
+Array2D::iterator Array2D::end() {
+    warn_deprecated("Array2D::end", "To be removed after Cantera 3.0.");
+    return m_data.end();
+}
+
+Array2D::const_iterator Array2D::begin() const {
+    warn_deprecated("Array2D::begin", "To be removed after Cantera 3.0.");
+    return m_data.begin();
+}
+
+Array2D::const_iterator Array2D::end() const {
+    warn_deprecated("Array2D::end", "To be removed after Cantera 3.0.");
+    return m_data.end();
+}
 
 std::ostream& operator<<(std::ostream& s, const Array2D& m)
 {

src/numerics/BandMatrix.cpp

@@ -292,23 +292,27 @@ int BandMatrix::solve(double* b, size_t nrhs, size_t ldb)
 
 vector<double>::iterator BandMatrix::begin()
 {
+    warn_deprecated("BandMatrix::begin", "To be removed after Cantera 3.0.");
     m_factored = false;
     return data.begin();
 }
 
 vector<double>::iterator BandMatrix::end()
 {
+    warn_deprecated("BandMatrix::end", "To be removed after Cantera 3.0.");
     m_factored = false;
     return data.end();
 }
 
 vector<double>::const_iterator BandMatrix::begin() const
 {
+    warn_deprecated("BandMatrix::begin", "To be removed after Cantera 3.0.");
     return data.begin();
 }
 
 vector<double>::const_iterator BandMatrix::end() const
 {
+    warn_deprecated("BandMatrix::end", "To be removed after Cantera 3.0.");
     return data.end();
 }