Merge branch 'codac2_dev' of https://github.com/damien-masse/codac in…

…to codac2_dev
codac-team · Nov 5, 2024 · 05b2175 · 05b2175
2 parents 28cf2eb + 1b40e95
commit 05b2175
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/python/src/core/matrices/codac2_py_VectorBase.h b/python/src/core/matrices/codac2_py_VectorBase.h
@@ -101,8 +101,7 @@ void export_VectorBase(py::module& m, py::class_<S>& pyclass)
 
     .def("__iter__", [](const S &x)
         {
-          auto x_ = x._e.reshaped();
-          return py::make_iterator(x_.begin(), x_.end());
+          return py::make_iterator(x._e.begin(), x._e.end());
         },
       py::keep_alive<0, 1>() /*  keep object alive while iterator exists */)
   ;

diff --git a/src/core/matrices/codac2_MatrixBase.h b/src/core/matrices/codac2_MatrixBase.h
@@ -298,7 +298,7 @@ namespace codac2
 
       iterator begin()
       {
-        return const_cast<iterator>(const_cast<const MatrixBase<S,T,Rows,Cols>*>(this)->begin());
+        return _e.begin();
       }
 
       const_iterator begin() const
@@ -313,7 +313,7 @@ namespace codac2
 
       iterator end()
       {
-        return const_cast<iterator>(const_cast<const MatrixBase<S,T,Rows,Cols>*>(this)->end());
+        return _e.end();
       }
 
       EigenType _e;

diff --git a/tests/core/matrices/codac2_tests_Vector.cpp b/tests/core/matrices/codac2_tests_Vector.cpp
@@ -16,5 +16,9 @@ using namespace codac2;
 
 TEST_CASE("Vector")
 {
-
+  size_t i = 0;
+  Vector a(3), b {{-1},{2},{-3}};
+  for(const auto& bi : b)
+    a[i++] = bi;
+  CHECK(a == b);
 }