more tests

Author: raphael-s-steiner

include/osp/graph_implementations/eigen_matrix_adapter/eigen_sparse_iterator.hpp

@@ -73,7 +73,7 @@ class EigenCSRRange {
         }
 
         bool operator==(const Iterator &other) const {return it_ == other.it_;}
-        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
+        bool operator!=(const Iterator &other) const { return not (*this == other);}
     };
 
     EigenCSRRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}
@@ -133,7 +133,7 @@ class EigenCSCRange {
         }
 
         bool operator==(const Iterator &other) const {return it_ == other.it_;}
-        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
+        bool operator!=(const Iterator &other) const { return not (*this == other);}
     };
 
     EigenCSCRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}

tests/sparse_matrix_impl.cpp

@@ -248,16 +248,22 @@ BOOST_AUTO_TEST_CASE(TestSparseMatrixAdapter2) {
             auto chldren = graph.Children(vert);
             auto chldren2 = graph2.Children(vert);
             auto it = chldren.begin();
+            auto it_other = chldren.begin();
+            const auto begin = chldren.begin();
             auto it2 = chldren2.begin();
             auto end = chldren.end();
             auto end2 = chldren2.end();
 
             std::size_t cntr = 0;
             while ((it != end) && (it2 != end2)) {
                 BOOST_CHECK_EQUAL(*it, *it2);
+                BOOST_CHECK(it == it_other);
+                BOOST_CHECK(cntr == 0U || it != begin);
+                BOOST_CHECK(cntr == 0U || (not (it == begin)));
 
                 ++cntr;
                 ++it;
+                ++it_other;
                 ++it2;
             }
             BOOST_CHECK_EQUAL(cntr, graph.OutDegree(vert));
@@ -271,13 +277,17 @@ BOOST_AUTO_TEST_CASE(TestSparseMatrixAdapter2) {
             auto parents = graph.Parents(vert);
             auto parents2 = graph2.Parents(vert);
             auto it = parents.begin();
+            auto it_other = parents.begin();
+            const auto begin = parents.begin();
             auto it2 = parents2.begin();
             auto end = parents.end();
             auto end2 = parents2.end();
 
             std::size_t cntr = 0;
             while ((it != end) && (it2 != end2)) {
                 BOOST_CHECK_EQUAL(*it, *it2);
+                BOOST_CHECK(cntr == 0U || it != begin);
+                BOOST_CHECK(cntr == 0U || (not (it == begin)));
 
                 ++cntr;
                 ++it;