Merge branch 'Sanitizers' of https://github.com/Algebraic-Programming/OneStopParallel into Sanitizers

Author: papp-pal-andras

include/osp/graph_implementations/eigen_matrix_adapter/eigen_sparse_iterator.hpp

@@ -20,10 +20,6 @@ limitations under the License.
 
 #ifdef EIGEN_FOUND
 
-#    include <Eigen/SparseCore>
-
-#    include "osp/concepts/graph_traits.hpp"
-
 namespace osp {
 
 template <typename Graph, typename EigenIdxType>
@@ -37,12 +33,10 @@ class EigenCSRRange {
 
     class Iterator {
         Inner it_;
-        EigenIdxType skip_;
-        bool atEnd_;
 
         void SkipDiagonal() {
-            while (((!atEnd_) && (it_.row() == skip_)) & (it_.col() == skip_)) {
-                ++(*this);
+            while (it_ && (it_.row() == it_.col())) {
+                ++it_;
             }
         }
 
@@ -55,28 +49,19 @@ class EigenCSRRange {
 
         Iterator() = default;
 
-        Iterator(const Iterator &other) : it_(other.it_), skip_(other.skip_), atEnd_(other.atEnd_) {}
+        Iterator(const Iterator &other) : it_(other.it_) {}
 
         Iterator &operator=(const Iterator &other) {
             it_ = other.it_;
-            skip_ = other.skip_;
-            atEnd_ = other.atEnd_;
             return *this;
         }
 
-        Iterator(const CSRMatrix &mat, EigenIdxType idx, bool end = false) : skip_(idx), atEnd_(end) {
-            if (!end) {
-                it_ = Inner(mat, idx);
-                atEnd_ = !it_;
-                SkipDiagonal();
-            }
-        }
+        Iterator(const CSRMatrix &mat, EigenIdxType idx) : it_(mat, idx) { SkipDiagonal(); }
 
         reference operator*() const { return static_cast<std::size_t>(it_.col()); }
 
         Iterator &operator++() {
             ++it_;
-            atEnd_ = !it_;
             SkipDiagonal();
             return *this;
         }
@@ -87,16 +72,15 @@ class EigenCSRRange {
             return temp;
         }
 
-        bool operator==(const Iterator &) const { return atEnd_; }
-
-        bool operator!=(const Iterator &) const { return !atEnd_; }
+        bool operator==(const Iterator &other) const {return it_ == other.it_;}
+        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
     };
 
     EigenCSRRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}
 
     Iterator begin() const { return Iterator(*graph_.GetCSR(), index_); }
 
-    Iterator end() const { return Iterator(*graph_.GetCSR(), index_, true); }
+    Iterator end() const { return Iterator(); }
 };
 
 template <typename Graph, typename EigenIdxType>
@@ -110,12 +94,10 @@ class EigenCSCRange {
 
     class Iterator {
         Inner it_;
-        EigenIdxType skip_;
-        bool atEnd_;
 
         void SkipDiagonal() {
-            while ((!atEnd_) & (it_.row() == skip_) & (it_.col() == skip_)) {
-                ++(*this);
+            while (it_ && (it_.row() == it_.col())) {
+                ++it_;
             }
         }
 
@@ -128,28 +110,19 @@ class EigenCSCRange {
 
         Iterator() = default;
 
-        Iterator(const Iterator &other) : it_(other.it_), skip_(other.skip_), atEnd_(other.atEnd_) {}
+        Iterator(const Iterator &other) : it_(other.it_) {}
 
         Iterator &operator=(const Iterator &other) {
             it_ = other.it_;
-            skip_ = other.skip_;
-            atEnd_ = other.atEnd_;
             return *this;
         }
 
-        Iterator(const CSCMatrix &mat, EigenIdxType idx, bool end = false) : skip_(idx), atEnd_(end) {
-            if (!end) {
-                it_ = Inner(mat, idx);
-                atEnd_ = !it_;
-                SkipDiagonal();
-            }
-        }
+        Iterator(const CSCMatrix &mat, EigenIdxType idx) : it_(mat, idx) { SkipDiagonal(); }
 
         reference operator*() const { return static_cast<std::size_t>(it_.row()); }
 
         Iterator &operator++() {
             ++it_;
-            atEnd_ = !it_;
             SkipDiagonal();
             return *this;
         }
@@ -160,16 +133,15 @@ class EigenCSCRange {
             return temp;
         }
 
-        bool operator==(const Iterator &) const { return atEnd_; }
-
-        bool operator!=(const Iterator &) const { return !atEnd_; }
+        bool operator==(const Iterator &other) const {return it_ == other.it_;}
+        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
     };
 
     EigenCSCRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}
 
     Iterator begin() const { return Iterator(*graph_.GetCSC(), index_); }
 
-    Iterator end() const { return Iterator(*graph_.GetCSC(), index_, true); }
+    Iterator end() const { return Iterator(); }
 };
 
 }    // namespace osp