Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
openmesh-python
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
openmesh-python
Commits
c1243f5d
Commit
c1243f5d
authored
Feb 01, 2018
by
Alexander Dielen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes most of the python2 unit tests
parent
697be987
Pipeline
#6120
failed with stage
in 1 minute and 35 seconds
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
223 additions
and
197 deletions
+223
-197
src/Circulator.hh
src/Circulator.hh
+0
-1
src/Iterator.hh
src/Iterator.hh
+0
-1
tests/test_property.py
tests/test_property.py
+48
-48
tests/test_trimesh_circulator_face_edge.py
tests/test_trimesh_circulator_face_edge.py
+5
-4
tests/test_trimesh_circulator_face_face.py
tests/test_trimesh_circulator_face_face.py
+10
-8
tests/test_trimesh_circulator_face_halfedge.py
tests/test_trimesh_circulator_face_halfedge.py
+5
-4
tests/test_trimesh_circulator_face_vertex.py
tests/test_trimesh_circulator_face_vertex.py
+5
-4
tests/test_trimesh_circulator_halfedge_loop.py
tests/test_trimesh_circulator_halfedge_loop.py
+10
-8
tests/test_trimesh_circulator_vertex_edge.py
tests/test_trimesh_circulator_vertex_edge.py
+11
-9
tests/test_trimesh_circulator_vertex_face.py
tests/test_trimesh_circulator_vertex_face.py
+14
-11
tests/test_trimesh_circulator_vertex_ihalfedge.py
tests/test_trimesh_circulator_vertex_ihalfedge.py
+12
-10
tests/test_trimesh_circulator_vertex_ohalfedge.py
tests/test_trimesh_circulator_vertex_ohalfedge.py
+12
-10
tests/test_trimesh_circulator_vertex_vertex.py
tests/test_trimesh_circulator_vertex_vertex.py
+11
-9
tests/test_trimesh_collapse.py
tests/test_trimesh_collapse.py
+60
-54
tests/test_trimesh_iterators.py
tests/test_trimesh_iterators.py
+20
-16
No files found.
src/Circulator.hh
View file @
c1243f5d
...
...
@@ -89,7 +89,6 @@ void expose_circulator(py::module& m, const char *_name) {
.
def
(
py
::
init
<
PolyMesh
&
,
CenterEntityHandle
>
())
.
def
(
"__iter__"
,
&
CirculatorWrapperT
<
Circulator
,
CenterEntityHandle
>::
iter
)
.
def
(
"__next__"
,
&
CirculatorWrapperT
<
Circulator
,
CenterEntityHandle
>::
next
)
.
def
(
"next"
,
&
CirculatorWrapperT
<
Circulator
,
CenterEntityHandle
>::
next
)
;
}
...
...
src/Iterator.hh
View file @
c1243f5d
...
...
@@ -114,7 +114,6 @@ void expose_iterator(py::module& m, const char *_name) {
.
def
(
"__iter__"
,
&
IteratorWrapperT
<
Iterator
,
n_items
>::
iter
)
.
def
(
"__next__"
,
&
IteratorWrapperT
<
Iterator
,
n_items
>::
next
)
.
def
(
"__len__"
,
&
IteratorWrapperT
<
Iterator
,
n_items
>::
len
)
.
def
(
"next"
,
&
IteratorWrapperT
<
Iterator
,
n_items
>::
next
)
;
}
...
...
tests/test_property.py
View file @
c1243f5d
...
...
@@ -52,26 +52,26 @@ class Property(unittest.TestCase):
# Check if property it is ok
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
0
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
3
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
0
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
3
)
# Check vertex positions
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
...
...
@@ -79,52 +79,52 @@ class Property(unittest.TestCase):
# Copy from vertex 1 to 0, with skipping build in properties
self
.
mesh
.
copy_all_properties
(
self
.
vhandle
[
1
],
self
.
vhandle
[
0
])
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
3
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
3
)
# Copy from vertex 2 to 3, including build in properties
self
.
mesh
.
copy_all_properties
(
self
.
vhandle
[
2
],
self
.
vhandle
[
3
],
True
)
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
def
test_check_status_properties_halfedge_edge_all_deleted
(
self
):
self
.
mesh
.
request_vertex_status
()
...
...
@@ -212,26 +212,26 @@ class Property(unittest.TestCase):
# Check if property it is ok
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
0
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
3
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
0
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
3
)
# Check vertex positions
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
...
...
@@ -239,52 +239,52 @@ class Property(unittest.TestCase):
# Copy from vertex 1 to 0, with skipping build in properties
self
.
mesh
.
copy_all_properties
(
self
.
vhandle
[
1
],
self
.
vhandle
[
0
])
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
3
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
3
)
# Copy from vertex 2 to 3, including build in properties
self
.
mesh
.
copy_all_properties
(
self
.
vhandle
[
2
],
self
.
vhandle
[
3
],
True
)
v_it
=
self
.
mesh
.
vertices
()
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
0
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
vh
=
v_it
.
next
(
)
vh
=
next
(
v_it
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
0
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
1
],
1
)
self
.
assertEqual
(
self
.
mesh
.
point
(
vh
)[
2
],
0
)
v_it
=
self
.
mesh
.
vertices
()
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
v_it
.
next
(
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
1
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
self
.
assertEqual
(
self
.
mesh
.
property
(
intHandle
,
next
(
v_it
)),
2
)
if
__name__
==
'__main__'
:
suite
=
unittest
.
TestLoader
().
loadTestsFromTestCase
(
Property
)
...
...
tests/test_trimesh_circulator_face_edge.py
View file @
c1243f5d
...
...
@@ -41,10 +41,11 @@ class TriMeshCirculatorFaceEdge(unittest.TestCase):
def
test_face_edge_iter_without_holes_increment
(
self
):
# Iterate around face 1 at the middle
fe_it
=
openmesh
.
FaceEdgeIter
(
self
.
mesh
,
self
.
mesh
.
face_handle
(
1
))
self
.
assertEqual
(
fe_it
.
__next__
().
idx
(),
4
)
self
.
assertEqual
(
fe_it
.
__next__
().
idx
(),
1
)
self
.
assertEqual
(
fe_it
.
__next__
().
idx
(),
3
)
self
.
assertRaises
(
StopIteration
,
fe_it
.
__next__
)
self
.
assertEqual
(
next
(
fe_it
).
idx
(),
4
)
self
.
assertEqual
(
next
(
fe_it
).
idx
(),
1
)
self
.
assertEqual
(
next
(
fe_it
).
idx
(),
3
)
with
self
.
assertRaises
(
StopIteration
):
next
(
fe_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_face_face.py
View file @
c1243f5d
...
...
@@ -49,9 +49,10 @@ class TrimeshCirculatorFaceFace(unittest.TestCase):
ff_it
=
self
.
mesh
.
ff
(
self
.
mesh
.
face_handle
(
1
))
self
.
assertEqual
(
ff_it
.
__next__
().
idx
(),
2
)
self
.
assertEqual
(
ff_it
.
__next__
().
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
ff_it
.
__next__
)
self
.
assertEqual
(
next
(
ff_it
).
idx
(),
2
)
self
.
assertEqual
(
next
(
ff_it
).
idx
(),
0
)
with
self
.
assertRaises
(
StopIteration
):
next
(
ff_it
)
def
test_face_face_iter_without_holes
(
self
):
# Add some vertices
...
...
@@ -106,10 +107,11 @@ class TrimeshCirculatorFaceFace(unittest.TestCase):
ff_it
=
self
.
mesh
.
ff
(
self
.
mesh
.
face_handle
(
1
))
self
.
assertEqual
(
ff_it
.
__next__
().
idx
(),
2
)
self
.
assertEqual
(
ff_it
.
__next__
().
idx
(),
0
)
self
.
assertEqual
(
ff_it
.
__next__
().
idx
(),
3
)
self
.
assertRaises
(
StopIteration
,
ff_it
.
__next__
)
self
.
assertEqual
(
next
(
ff_it
).
idx
(),
2
)
self
.
assertEqual
(
next
(
ff_it
).
idx
(),
0
)
self
.
assertEqual
(
next
(
ff_it
).
idx
(),
3
)
with
self
.
assertRaises
(
StopIteration
):
next
(
ff_it
)
def
test_face_face_iter_without_holes
(
self
):
# Add some vertices
...
...
@@ -147,7 +149,7 @@ class TrimeshCirculatorFaceFace(unittest.TestCase):
face_iter
=
self
.
mesh
.
ff
(
fh1
)
# Get the face via the handle
faceHandle1
=
face_iter
.
__next__
(
)
faceHandle1
=
next
(
face_iter
)
face1
=
self
.
mesh
.
face
(
faceHandle1
)
self
.
assertEqual
(
faceHandle1
.
idx
(),
1
)
...
...
tests/test_trimesh_circulator_face_halfedge.py
View file @
c1243f5d
...
...
@@ -41,10 +41,11 @@ class TriMeshCirculatorFaceHalfEdge(unittest.TestCase):
def
test_face_halfedge_iter_without_holes_increment
(
self
):
# Iterate around face 1 at the middle
fh_it
=
openmesh
.
FaceHalfedgeIter
(
self
.
mesh
,
self
.
mesh
.
face_handle
(
1
))
self
.
assertEqual
(
fh_it
.
__next__
().
idx
(),
8
)
self
.
assertEqual
(
fh_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
fh_it
.
__next__
().
idx
(),
6
)
self
.
assertRaises
(
StopIteration
,
fh_it
.
__next__
)
self
.
assertEqual
(
next
(
fh_it
).
idx
(),
8
)
self
.
assertEqual
(
next
(
fh_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
fh_it
).
idx
(),
6
)
with
self
.
assertRaises
(
StopIteration
):
next
(
fh_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_face_vertex.py
View file @
c1243f5d
...
...
@@ -39,10 +39,11 @@ class TriMeshCirculatorFaceVertex(unittest.TestCase):
# Iterate around face 0 at the top
fv_it
=
openmesh
.
FaceVertexIter
(
self
.
mesh
,
self
.
fh0
)
self
.
assertEqual
(
fv_it
.
__next__
().
idx
(),
0
)
self
.
assertEqual
(
fv_it
.
__next__
().
idx
(),
1
)
self
.
assertEqual
(
fv_it
.
__next__
().
idx
(),
2
)
self
.
assertRaises
(
StopIteration
,
fv_it
.
__next__
)
self
.
assertEqual
(
next
(
fv_it
).
idx
(),
0
)
self
.
assertEqual
(
next
(
fv_it
).
idx
(),
1
)
self
.
assertEqual
(
next
(
fv_it
).
idx
(),
2
)
with
self
.
assertRaises
(
StopIteration
):
next
(
fv_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_halfedge_loop.py
View file @
c1243f5d
...
...
@@ -66,10 +66,11 @@ class TrimeshCirculatorHalfedgeLoop(unittest.TestCase):
# Circle around face 1
hl_it
=
self
.
mesh
.
hl
(
self
.
mesh
.
halfedge_handle
(
3
))
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
6
)
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
8
)
self
.
assertRaises
(
StopIteration
,
hl_it
.
__next__
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
6
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
8
)
with
self
.
assertRaises
(
StopIteration
):
next
(
hl_it
)
def
test_halfedge_loop_without_face
(
self
):
# Add some vertices
...
...
@@ -122,10 +123,11 @@ class TrimeshCirculatorHalfedgeLoop(unittest.TestCase):
# Circle around the hole
hl_it
=
self
.
mesh
.
hl
(
self
.
mesh
.
halfedge_handle
(
3
))
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
17
)
self
.
assertEqual
(
hl_it
.
__next__
().
idx
(),
7
)
self
.
assertRaises
(
StopIteration
,
hl_it
.
__next__
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
17
)
self
.
assertEqual
(
next
(
hl_it
).
idx
(),
7
)
with
self
.
assertRaises
(
StopIteration
):
next
(
hl_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_vertex_edge.py
View file @
c1243f5d
...
...
@@ -37,19 +37,21 @@ class TriMeshCirculatorVertexEdge(unittest.TestCase):
def
test_vertex_edge_iter_without_holes_increment
(
self
):
# Iterate around vertex 1 at the middle
ve_it
=
openmesh
.
VertexEdgeIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
5
)
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
0
)
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
1
)
self
.
assertRaises
(
StopIteration
,
ve_it
.
__next__
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
5
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
0
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
1
)
with
self
.
assertRaises
(
StopIteration
):
next
(
ve_it
)
def
test_vertex_edge_iter_boundary_increment
(
self
):
# Iterate around vertex 2 at the boundary
ve_it
=
openmesh
.
VertexEdgeIter
(
self
.
mesh
,
self
.
vhandle
[
2
])
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
7
)
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
1
)
self
.
assertEqual
(
ve_it
.
__next__
().
idx
(),
2
)
self
.
assertRaises
(
StopIteration
,
ve_it
.
__next__
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
7
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
1
)
self
.
assertEqual
(
next
(
ve_it
).
idx
(),
2
)
with
self
.
assertRaises
(
StopIteration
):
next
(
ve_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_vertex_face.py
View file @
c1243f5d
...
...
@@ -35,9 +35,10 @@ class TriMeshCirculatorVertexFace(unittest.TestCase):
# Iterate around vertex 1 at the middle (with holes in between)
vf_it
=
openmesh
.
VertexFaceIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
0
)
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
1
)
self
.
assertRaises
(
StopIteration
,
vf_it
.
__next__
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
0
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
1
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vf_it
)
def
test_vertex_face_iter_without_holes_increment
(
self
):
# Add four faces
...
...
@@ -59,11 +60,12 @@ class TriMeshCirculatorVertexFace(unittest.TestCase):
# Iterate around vertex 1 at the middle (without holes in between)
vf_it
=
openmesh
.
VertexFaceIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
1
)
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
2
)
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
vf_it
.
__next__
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
1
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
2
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
0
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vf_it
)
def
test_vertex_face_iter_boundary_increment
(
self
):
# Add four faces
...
...
@@ -85,9 +87,10 @@ class TriMeshCirculatorVertexFace(unittest.TestCase):
# Iterate around vertex 2 at the boundary (without holes in between)
vf_it
=
openmesh
.
VertexFaceIter
(
self
.
mesh
,
self
.
vhandle
[
2
])
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
vf_it
.
__next__
().
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
vf_it
.
__next__
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
vf_it
).
idx
(),
0
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vf_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_circulator_vertex_ihalfedge.py
View file @
c1243f5d
...
...
@@ -38,38 +38,40 @@ class TriMeshCirculatorVertexIHalfEdge(unittest.TestCase):
def
test_vertex_incoming_halfedge_without_holes_increment
(
self
):
# Iterate around vertex 1 at the middle
vih_it
=
openmesh
.
VertexIHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
10
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
1
)
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
7
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
2
)
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
0
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
0
)
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
3
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
3
)
self
.
assertRaises
(
StopIteration
,
vih_it
.
__next__
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vih_it
)
def
test_vertex_incoming_halfedge_boundary_increment
(
self
):
# Iterate around vertex 2 at the boundary
vih_it
=
openmesh
.
VertexIHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
2
])
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
14
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
3
)
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
2
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
0
)
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
self
.
assertEqual
(
heh
.
idx
(),
5
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
-
1
)
self
.
assertRaises
(
StopIteration
,
vih_it
.
__next__
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vih_it
)
def
test_vertex_incoming_halfedge_dereference_increment
(
self
):
# Iterate around vertex 1 at the middle
vih_it
=
openmesh
.
VertexIHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
heh
=
vih_it
.
__next__
(
)
heh
=
next
(
vih_it
)
eh
=
self
.
mesh
.
edge_handle
(
heh
)
vh
=
self
.
mesh
.
to_vertex_handle
(
heh
)
self
.
assertEqual
(
heh
.
idx
(),
10
)
...
...
tests/test_trimesh_circulator_vertex_ohalfedge.py
View file @
c1243f5d
...
...
@@ -38,38 +38,40 @@ class TriMeshCirculatorVertexOHalfEdge(unittest.TestCase):
def
test_vertex_outgoing_halfedge_without_holes_increment
(
self
):
# Iterate around vertex 1 at the middle
voh_it
=
openmesh
.
VertexOHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
11
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
3
)
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
6
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
1
)
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
1
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
2
)
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
2
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
voh_it
.
__next__
)
with
self
.
assertRaises
(
StopIteration
):
next
(
voh_it
)
def
test_vertex_outgoing_halfedge_boundary_increment
(
self
):
# Iterate around vertex 2 at the boundary
voh_it
=
openmesh
.
VertexOHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
2
])
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
15
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
-
1
)
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
3
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
3
)
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
self
.
assertEqual
(
heh
.
idx
(),
4
)
self
.
assertEqual
(
self
.
mesh
.
face_handle
(
heh
).
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
voh_it
.
__next__
)
with
self
.
assertRaises
(
StopIteration
):
next
(
voh_it
)
def
test_vertex_outgoing_halfedge_dereference_increment
(
self
):
# Iterate around vertex 1 at the middle
voh_it
=
openmesh
.
VertexOHalfedgeIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
heh
=
voh_it
.
__next__
(
)
heh
=
next
(
voh_it
)
eh
=
self
.
mesh
.
edge_handle
(
heh
)
vh
=
self
.
mesh
.
to_vertex_handle
(
heh
)
self
.
assertEqual
(
heh
.
idx
(),
11
)
...
...
tests/test_trimesh_circulator_vertex_vertex.py
View file @
c1243f5d
...
...
@@ -38,19 +38,21 @@ class TriMeshCirculatorVertexVertex(unittest.TestCase):
def
test_vertex_vertex_increment
(
self
):
# Iterate around vertex 1 at the middle
vv_it
=
openmesh
.
VertexVertexIter
(
self
.
mesh
,
self
.
vhandle
[
1
])
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
4
)
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
3
)
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
0
)
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
2
)
self
.
assertRaises
(
StopIteration
,
vv_it
.
__next__
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
4
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
3
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
0
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
2
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vv_it
)
def
test_vertex_vertex_boundary_increment
(
self
):
# Iterate around vertex 2 at the boundary
vv_it
=
openmesh
.
VertexVertexIter
(
self
.
mesh
,
self
.
vhandle
[
2
])
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
4
)
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
1
)
self
.
assertEqual
(
vv_it
.
__next__
().
idx
(),
0
)
self
.
assertRaises
(
StopIteration
,
vv_it
.
__next__
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
4
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
1
)
self
.
assertEqual
(
next
(
vv_it
).
idx
(),
0
)
with
self
.
assertRaises
(
StopIteration
):
next
(
vv_it
)
if
__name__
==
'__main__'
:
...
...
tests/test_trimesh_collapse.py
View file @
c1243f5d
...
...
@@ -197,15 +197,15 @@ class Collapse(unittest.TestCase):
fv_it
=
self
.
mesh
.
fv
(
fh_1
)
self
.
assert
True
(
fv_it
.
__next__
(
).
idx
(),
1
)
self
.
assert
True
(
fv_it
.
__next__
(
).
idx
(),
2
)
self
.
assert
True
(
fv_it
.
__next__
(
).
idx
(),
3
)
self
.
assert
Equal
(
next
(
fv_it
).
idx
(),
1
)
self
.
assert
Equal
(
next
(
fv_it
).
idx
(),
2
)
self
.
assert
Equal
(
next
(
fv_it
).
idx
(),
3
)
fv_it
=
self
.
mesh
.
fv
(
fh_2
)
self
.
assert
True
(
fv_it
.
__next__
(
).
idx
(),
2
)