Make GNdarray::index() method public

Jürgen Knödlseder
1 parent fca0cb57
Showing 3 changed files with 31 additions and 30 deletions
include/GNdarray.hpp
pyext/GNdarray.i
src/numerics/GNdarray.cpp
 /***************************************************************************
  *                 GNdarray.hpp - N-dimensional array class                *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2016-2018 by Juergen Knoedlseder                         *
+ *  copyright (C) 2016-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -110,6 +110,7 @@ public:
     const std::vector<int>& shape(void) const;
     const std::vector<int>& strides(void) const;
     void                    shape(const std::vector<int>& shape);
+    int                     index(const std::vector<int>& i) const;
     double&                 at(const int& ix);
     double&                 at(const int& ix, const int& iy);
     double&                 at(const int& ix, const int& iy, const int& iz);
@@ -127,7 +128,6 @@ protected:
     void init_members(void);
     void copy_members(const GNdarray& array);
     void free_members(void);
-    int  index(const std::vector<int>& i) const;
     bool has_same_shape(const GNdarray& array) const;
     void require_same_shape(const std::string& method, const GNdarray& array) const;
 /***************************************************************************
  *                  GNdarray.i - N-dimensional array class                 *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2016-2018 by Juergen Knoedlseder                         *
+ *  copyright (C) 2016-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -70,6 +70,7 @@ public:
     const std::vector<int>& shape(void) const;
     const std::vector<int>& strides(void) const;
     void                    shape(const std::vector<int>& shape);
+    int                     index(const std::vector<int>& i) const;
     double*                 data(void);
 };
 /***************************************************************************
  *                 GNdarray.cpp - N-dimensional array class                *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2016-2018 by Juergen Knoedlseder                         *
+ *  copyright (C) 2016-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -741,6 +741,32 @@ const double&amp; GNdarray::at(const std::vector&lt;int&gt;&amp; i) const
 /***********************************************************************//**
+ * @brief Compute array element index
+ *
+ * @param[in] i Index vector.
+ * @return Array element index.
+ *
+ * Computes the array element index from an index vector. The method assumes
+ * that the index vector has the same dimension as the array. If this
+ * condition is not guaranteed, the condition needs to be checked before
+ * calling the method.
+ ***************************************************************************/
+int GNdarray::index(const std::vector<int>& i) const
+{
+    // Initialise element index
+    int index = 0;
+
+    // Compute element index
+    for (int k = 0; k < m_shape.size(); ++k) {
+        index += m_strides[k] * i[k];
+    }
+
+    // Return index
+    return index;
+}
+
+
+/***********************************************************************//**
  * @brief Print array information
  *
  * @param[in] chatter Chattiness.
@@ -824,32 +850,6 @@ void GNdarray::free_members(void)
 /***********************************************************************//**
- * @brief Compute array element index
- *
- * @param[in] i Index vector.
- * @return Array element index.
- *
- * Computes the array element index from an index vector. The method assumes
- * that the index vector has the same dimension as the array. If this
- * condition is not guaranteed, the condition needs to be checked before
- * calling the method.
- ***************************************************************************/
-int GNdarray::index(const std::vector<int>& i) const
-{
-    // Initialise element index
-    int index = 0;
-
-    // Compute element index
-    for (int k = 0; k < m_shape.size(); ++k) {
-        index += m_strides[k] * i[k];
-    }
-
-    // Return index
-    return index;
-}
-
-
-/***********************************************************************//**
  * @brief Check if array has the same shape
  *
  * @param[in] array Array.