1 files changed, 180 insertions, 0 deletions
diff --git a/include/mm/experiments/iterators.hpp b/include/mm/experiments/iterators.hpp
index 4afd58f..fb5f568 100644
--- a/include/mm/experiments/iterators.hpp
+++ b/include/mm/experiments/iterators.hpp
@@ -619,4 +619,184 @@ T& mm::const_diag_iterator<T, N>::operator*() const
         M.data[index * Cols + (index - position)];
 }
 
+/*
+ * SECOND IMPLEMENTATION
+ *
+ */
+
+// TODO, short term solution
+#define MM_ROW_ITER 0
+#define MM_COL_ITER 1
+#define MM_DIAG_ITER 2
+
+template<typename T, std::size_t Rows, std::size_t Cols, int IterType, class Grid>
+class mm::vector_iterator
+{
+    std::size_t index; // variable index
+
+    Grid& M;
+
+    const int position; // fixed index, negative too for diagonal iterator
+
+public:
+
+    vector_iterator(Grid& M, int position, std::size_t index = 0);
+
+    operator T&()
+    {
+        return *(*this);
+    }
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid> operator++()
+    {
+        vector_iterator<T, Rows, Cols, IterType, Grid> it = *this;
+        ++index;
+        return it;
+    }
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid> operator--()
+    {
+        vector_iterator<T, Rows, Cols, IterType, Grid> it = *this;
+        --index;
+        return it;
+    }
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid>& operator++(int)
+    {
+        ++index;
+        return *this;
+    }
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid>& operator--(int)
+    {
+        --index;
+        return *this;
+    }
+
+    bool operator==(const mm::vector_iterator<T, Rows, Cols, IterType, Grid>& other) const
+    {
+        return index == other.index;
+    }
+
+    bool operator!=(const mm::vector_iterator<T, Rows, Cols, IterType, Grid>& other) const
+    {
+        return index != other.index;
+    }
+
+    bool ok() const
+    {
+        if constexpr(IterType == MM_ROW_ITER)
+            return index < Cols;
+        else 
+            return index < Rows;
+    }
+
+    T& operator*();
+    T& operator[](std::size_t);
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid> begin()
+    {
+        return mm::vector_iterator<T, Rows, Cols, IterType, Grid>(M, position, 0);
+    }
+
+    mm::vector_iterator<T, Rows, Cols, IterType, Grid> end()
+    {
+        if constexpr(IterType == MM_ROW_ITER)
+            return mm::vector_iterator<T, Rows, Cols, IterType, Grid>(M, position, Cols);
+        else 
+            return mm::vector_iterator<T, Rows, Cols, IterType, Grid>(M, position, Rows);
+    }
+
+    /*
+     * Scalar product 
+     */
+
+    template<std::size_t P>
+    T operator*(const mm::vector_iterator<T, Rows, P, IterType, Grid>& v)
+    {
+        T out(0);
+
+        for (unsigned k(0); k < Rows; ++k)
+            out += (*this)[k] * v[k];
+
+        return out;
+    }
+
+    template<std::size_t P>
+    T operator*(const mm::vector_iterator<T, P, Cols, IterType, Grid>& v)
+    {
+        T out(0);
+
+        for (unsigned k(0); k < Cols; ++k)
+            out += (*this)[k] * v[k];
+
+        return out;
+    }
+};
+
+
+/* Row Iterators */
+
+namespace mm {
+
+    template<typename T, std::size_t Rows, std::size_t Cols>
+    using row_iterator = vector_iterator<T, Rows, Cols, MM_ROW_ITER, mm::basic_matrix<T, Rows, Cols>>;
+
+    template<typename T, std::size_t Rows, std::size_t Cols>
+    using col_iterator = vector_iterator<T, Rows, Cols, MM_COL_ITER, mm::basic_matrix<T, Rows, Cols>>;
+
+    template<typename T, std::size_t Rows, std::size_t Cols>
+    using const_row_iterator = vector_iterator<typename std::add_const<T>::type, Rows, Cols, MM_ROW_ITER, typename std::add_const<mm::basic_matrix<T, Rows, Cols>>::type>;
+
+    template<typename T, std::size_t Rows, std::size_t Cols>
+    using const_col_iterator = vector_iterator<typename std::add_const<T>::type, Rows, Cols, MM_COL_ITER, typename std::add_const<mm::basic_matrix<T, Rows, Cols>>::type>;
+
+    template<typename T, std::size_t N>
+    using diag_iterator = vector_iterator<T, N, N, MM_DIAG_ITER, mm::basic_matrix<T, N, N>>;
+
+    template<typename T, std::size_t N>
+    using const_diag_iterator = vector_iterator<typename std::add_const<T>::type, N, N, MM_DIAG_ITER, typename std::add_const<mm::basic_matrix<T, N, N>>::type>;
+}
+
+
+/* Iterators implementation */
+
+template<typename T, std::size_t Rows, std::size_t Cols, int IterType, class Grid>
+mm::vector_iterator<T, Rows, Cols, IterType, Grid>::vector_iterator(Grid& _M, int pos, std::size_t i)
+    : index(i), M(_M), position(pos)
+{
+    if constexpr (IterType == MM_ROW_ITER) {
+        assert(pos < Rows);
+    } else if constexpr (IterType == MM_COL_ITER) {
+        assert(pos < Cols);
+    } else if constexpr (IterType == MM_DIAG_ITER) {
+        assert(abs(pos) < Rows);
+    }
+}
+
+template<typename T, std::size_t Rows, std::size_t Cols, int IterType, class Grid>
+T& mm::vector_iterator<T, Rows, Cols, IterType, Grid>::operator*()
+{
+    if constexpr (IterType == MM_ROW_ITER)
+        return M.data[position * Cols + index];
+    else if constexpr (IterType == MM_COL_ITER)
+        return M.data[index * Cols + position];
+    else if constexpr (IterType == MM_DIAG_ITER)
+        return (position > 0) ?
+            M.data[(index + position) * Cols + index] :
+            M.data[index * Cols + (index - position)];
+}
+
+template<typename T, std::size_t Rows, std::size_t Cols, int IterType, class Grid>
+T& mm::vector_iterator<T, Rows, Cols, IterType, Grid>::operator[](std::size_t i)
+{
+    if constexpr (IterType == MM_ROW_ITER)
+        return M.data[position * Cols + i];
+    else if constexpr (IterType == MM_COL_ITER)
+        return M.data[i * Cols + position];
+    else if constexpr (IterType == MM_DIAG_ITER)
+        return (position > 0) ?
+            M.data[(i + position) * Cols + i] :
+            M.data[i * Cols + (i - position)];
+}