From a0fe60947aae1434010a038d77abbcdb07881ee6 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino <102665781+quagla@users.noreply.github.com> Date: Wed, 30 Aug 2023 19:33:11 +0100 Subject: [PATCH 1/5] Update entity_iterators.hpp --- .../Discregrid/mesh/entity_iterators.hpp | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/discregrid/include/Discregrid/mesh/entity_iterators.hpp b/discregrid/include/Discregrid/mesh/entity_iterators.hpp index 3c736a8..4b90be5 100755 --- a/discregrid/include/Discregrid/mesh/entity_iterators.hpp +++ b/discregrid/include/Discregrid/mesh/entity_iterators.hpp @@ -12,10 +12,14 @@ namespace Discregrid class TriangleMesh; class FaceContainer; -class FaceIterator : public - std::iterator> +class FaceIterator { public: + using iterator_category = std::random_access_iterator_tag; + using value_type = std::array; + using difference_type = unsigned int; + using pointer = std::array*; + using reference = std::array&; typedef FaceIterator _Mytype; @@ -65,11 +69,15 @@ class FaceIterator : public unsigned int m_index; TriangleMesh* m_mesh; }; -class FaceConstIterator : public - std::iterator const> +class FaceConstIterator { public: + using iterator_category = std::random_access_iterator_tag; + using value_type = std::array const; + using difference_type = unsigned int const; + using pointer = std::array const*; + using reference = std::array const&; typedef FaceConstIterator _Mytype; @@ -121,10 +129,15 @@ class FaceConstIterator : public }; class IncidentFaceContainer; -class IncidentFaceIterator : public std::iterator +class IncidentFaceIterator { public: + using iterator_category = std::forward_iterator_tag; + using value_type = Halfedge; + using difference_type = Halfedge; + using pointer = Halfedge*; + using reference = Halfedge&; typedef IncidentFaceIterator _Mytype; @@ -152,10 +165,15 @@ class IncidentFaceIterator : public std::iterator +class VertexIterator { public: + using iterator_category = std::random_access_iterator_tag; + using value_type = Eigen::Vector3d; + using difference_type = double; + using pointer = Eigen::Vector3d*; + using reference = Eigen::Vector3d&; typedef VertexIterator _Mytype; @@ -207,11 +225,15 @@ class VertexIterator : public std::iterator +class VertexConstIterator { public: + using iterator_category = std::random_access_iterator_tag; + using value_type = Eigen::Vector3d const; + using difference_type = double const; + using pointer = Eigen::Vector3d* const; + using reference = Eigen::Vector3d const&; typedef VertexConstIterator _Mytype; @@ -261,4 +283,3 @@ class VertexConstIterator : TriangleMesh const* m_mesh; }; } - From 3d319200ac122642a4bbc9b8c2b8ff7ad6b3d6a8 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino <102665781+quagla@users.noreply.github.com> Date: Wed, 30 Aug 2023 19:35:02 +0100 Subject: [PATCH 2/5] Update entity_iterators.hpp --- .../include/Discregrid/mesh/entity_iterators.hpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/discregrid/include/Discregrid/mesh/entity_iterators.hpp b/discregrid/include/Discregrid/mesh/entity_iterators.hpp index 4b90be5..584566e 100755 --- a/discregrid/include/Discregrid/mesh/entity_iterators.hpp +++ b/discregrid/include/Discregrid/mesh/entity_iterators.hpp @@ -15,7 +15,7 @@ class FaceContainer; class FaceIterator { public: - using iterator_category = std::random_access_iterator_tag; + using iterator_category = std::random_access_iterator_tag; using value_type = std::array; using difference_type = unsigned int; using pointer = std::array*; @@ -73,7 +73,7 @@ class FaceConstIterator { public: - using iterator_category = std::random_access_iterator_tag; + using iterator_category = std::random_access_iterator_tag; using value_type = std::array const; using difference_type = unsigned int const; using pointer = std::array const*; @@ -133,7 +133,7 @@ class IncidentFaceIterator { public: - using iterator_category = std::forward_iterator_tag; + using iterator_category = std::forward_iterator_tag; using value_type = Halfedge; using difference_type = Halfedge; using pointer = Halfedge*; @@ -169,7 +169,7 @@ class VertexIterator { public: - using iterator_category = std::random_access_iterator_tag; + using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d; using difference_type = double; using pointer = Eigen::Vector3d*; @@ -229,7 +229,7 @@ class VertexConstIterator { public: - using iterator_category = std::random_access_iterator_tag; + using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d const; using difference_type = double const; using pointer = Eigen::Vector3d* const; @@ -283,3 +283,4 @@ class VertexConstIterator TriangleMesh const* m_mesh; }; } + From 2baa7165dcd0f27f011ef502028c5e966797967e Mon Sep 17 00:00:00 2001 From: Alessio Quaglino <102665781+quagla@users.noreply.github.com> Date: Wed, 30 Aug 2023 19:49:05 +0100 Subject: [PATCH 3/5] Update entity_iterators.hpp --- discregrid/include/Discregrid/mesh/entity_iterators.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/discregrid/include/Discregrid/mesh/entity_iterators.hpp b/discregrid/include/Discregrid/mesh/entity_iterators.hpp index 584566e..5ad706e 100755 --- a/discregrid/include/Discregrid/mesh/entity_iterators.hpp +++ b/discregrid/include/Discregrid/mesh/entity_iterators.hpp @@ -106,7 +106,7 @@ class FaceConstIterator { return _Mytype(m_index + rhs.m_index, m_mesh); } - inline difference_type operator-(_Mytype const& rhs) const + inline ype operator-(_Mytype const& rhs) const { return m_index - rhs.m_index; } @@ -135,7 +135,7 @@ class IncidentFaceIterator public: using iterator_category = std::forward_iterator_tag; using value_type = Halfedge; - using difference_type = Halfedge; + using difference_type = unsigned int; using pointer = Halfedge*; using reference = Halfedge&; @@ -171,7 +171,7 @@ class VertexIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d; - using difference_type = double; + using difference_type = unsigned int; using pointer = Eigen::Vector3d*; using reference = Eigen::Vector3d&; @@ -231,7 +231,7 @@ class VertexConstIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d const; - using difference_type = double const; + using difference_type = unsigned int const; using pointer = Eigen::Vector3d* const; using reference = Eigen::Vector3d const&; From b571e1c95f8f60bf4659999b6e9553863eaffb0e Mon Sep 17 00:00:00 2001 From: Alessio Quaglino <102665781+quagla@users.noreply.github.com> Date: Wed, 30 Aug 2023 19:51:04 +0100 Subject: [PATCH 4/5] Update entity_iterators.hpp --- discregrid/include/Discregrid/mesh/entity_iterators.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discregrid/include/Discregrid/mesh/entity_iterators.hpp b/discregrid/include/Discregrid/mesh/entity_iterators.hpp index 5ad706e..4bc2396 100755 --- a/discregrid/include/Discregrid/mesh/entity_iterators.hpp +++ b/discregrid/include/Discregrid/mesh/entity_iterators.hpp @@ -106,7 +106,7 @@ class FaceConstIterator { return _Mytype(m_index + rhs.m_index, m_mesh); } - inline ype operator-(_Mytype const& rhs) const + inline difference_type operator-(_Mytype const& rhs) const { return m_index - rhs.m_index; } From 0107d4025323c966ee433b6d787a6ea336abbfd7 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino <102665781+quagla@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:29:57 +0100 Subject: [PATCH 5/5] Update entity_iterators.hpp --- .../Discregrid/mesh/entity_iterators.hpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/discregrid/include/Discregrid/mesh/entity_iterators.hpp b/discregrid/include/Discregrid/mesh/entity_iterators.hpp index 4bc2396..529027f 100755 --- a/discregrid/include/Discregrid/mesh/entity_iterators.hpp +++ b/discregrid/include/Discregrid/mesh/entity_iterators.hpp @@ -17,9 +17,9 @@ class FaceIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = std::array; - using difference_type = unsigned int; - using pointer = std::array*; - using reference = std::array&; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; typedef FaceIterator _Mytype; @@ -75,9 +75,9 @@ class FaceConstIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = std::array const; - using difference_type = unsigned int const; - using pointer = std::array const*; - using reference = std::array const&; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; typedef FaceConstIterator _Mytype; @@ -135,9 +135,9 @@ class IncidentFaceIterator public: using iterator_category = std::forward_iterator_tag; using value_type = Halfedge; - using difference_type = unsigned int; - using pointer = Halfedge*; - using reference = Halfedge&; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; typedef IncidentFaceIterator _Mytype; @@ -171,9 +171,9 @@ class VertexIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d; - using difference_type = unsigned int; - using pointer = Eigen::Vector3d*; - using reference = Eigen::Vector3d&; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; typedef VertexIterator _Mytype; @@ -231,9 +231,9 @@ class VertexConstIterator public: using iterator_category = std::random_access_iterator_tag; using value_type = Eigen::Vector3d const; - using difference_type = unsigned int const; - using pointer = Eigen::Vector3d* const; - using reference = Eigen::Vector3d const&; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; typedef VertexConstIterator _Mytype;