Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
5c8a97cf
Commit
5c8a97cf
authored
Feb 02, 2012
by
Sylvain Thery
Browse files
correctin bug, now can make multiple traverse with same traversor3
parent
26e238b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/Topology/generic/traversor3.h
View file @
5c8a97cf
...
...
@@ -65,6 +65,7 @@ private:
Dart
m_current
;
TraversorDartsOfOrbit
<
MAP
>
m_tradoo
;
bool
m_allocated
;
bool
m_first
;
public:
Traversor3XY
(
MAP
&
map
,
Dart
dart
,
bool
forceDartMarker
=
false
,
unsigned
int
thread
=
0
)
;
Traversor3XY
(
MAP
&
map
,
Dart
dart
,
MarkerForTraversor
<
MAP
,
ORBIT_Y
>&
tmo
,
bool
forceDartMarker
=
false
,
unsigned
int
thread
=
0
)
;
...
...
include/Topology/generic/traversor3.hpp
View file @
5c8a97cf
...
...
@@ -105,7 +105,8 @@ Traversor3XY<MAP,ORBIT_X,ORBIT_Y>::Traversor3XY(MAP& map, Dart dart, bool forceD
m_dmark
(
NULL
),
m_cmark
(
NULL
),
m_tradoo
(
map
,
ORBIT_X
,
dart
,
thread
),
m_allocated
(
true
)
m_allocated
(
true
),
m_first
(
true
)
{
if
(
!
forceDartMarker
&&
map
.
isOrbitEmbedded
(
ORBIT_Y
))
m_cmark
=
new
CellMarkerStore
(
map
,
ORBIT_Y
,
thread
)
;
...
...
@@ -117,7 +118,8 @@ template <typename MAP, unsigned int ORBIT_X, unsigned int ORBIT_Y>
Traversor3XY
<
MAP
,
ORBIT_X
,
ORBIT_Y
>::
Traversor3XY
(
MAP
&
map
,
Dart
dart
,
MarkerForTraversor
<
MAP
,
ORBIT_Y
>&
tmo
,
bool
forceDartMarker
,
unsigned
int
thread
)
:
m_map
(
map
),
m_tradoo
(
map
,
ORBIT_X
,
dart
,
thread
),
m_allocated
(
false
)
m_allocated
(
false
),
m_first
(
true
)
{
m_cmark
=
tmo
.
cmark
();
m_dmark
=
tmo
.
dmark
();
...
...
@@ -138,17 +140,29 @@ Traversor3XY<MAP,ORBIT_X,ORBIT_Y>::~Traversor3XY()
template
<
typename
MAP
,
unsigned
int
ORBIT_X
,
unsigned
int
ORBIT_Y
>
Dart
Traversor3XY
<
MAP
,
ORBIT_X
,
ORBIT_Y
>::
begin
()
{
m_current
=
m_tradoo
.
begin
()
;
// for the case of beginning with a given MarkerForTraversor
if
(
m_cmark
)
if
(
!
m_first
)
{
while
((
m_current
!=
NIL
)
&&
m_cmark
->
isMarked
(
m_current
))
m_current
=
m_tradoo
.
next
();
if
(
m_cmark
)
m_cmark
->
unmarkAll
();
else
m_dmark
->
unmarkAll
();
}
else
m_first
=
false
;
m_current
=
m_tradoo
.
begin
()
;
// for the case of beginning with a given MarkerForTraversor
if
(
!
m_allocated
)
{
while
((
m_current
!=
NIL
)
&&
m_dmark
->
isMarked
(
m_current
))
m_current
=
m_tradoo
.
next
();
if
(
m_cmark
)
{
while
((
m_current
!=
NIL
)
&&
m_cmark
->
isMarked
(
m_current
))
m_current
=
m_tradoo
.
next
();
}
else
{
while
((
m_current
!=
NIL
)
&&
m_dmark
->
isMarked
(
m_current
))
m_current
=
m_tradoo
.
next
();
}
}
return
m_current
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment