Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
KennethVanhoey
CGoGN
Commits
37b3cdd9
Commit
37b3cdd9
authored
Oct 19, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug TraversorCell : quickTraversor disable forceDartMarker
parent
9b573352
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
+20
-18
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+1
-1
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+2
-2
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+17
-15
No files found.
include/Topology/generic/genericmap.h
View file @
37b3cdd9
...
...
@@ -447,7 +447,7 @@ public:
void
enableQuickTraversal
()
;
template
<
unsigned
int
ORBIT
>
void
updateQuickTraversal
()
;
void
updateQuickTraversal
(
const
FunctorSelect
&
good
=
allDarts
)
;
template
<
unsigned
int
ORBIT
>
AttributeMultiVector
<
Dart
>*
getQuickTraversal
()
;
...
...
include/Topology/generic/genericmap.hpp
View file @
37b3cdd9
...
...
@@ -435,14 +435,14 @@ inline void GenericMap::enableQuickTraversal()
}
template
<
unsigned
int
ORBIT
>
inline
void
GenericMap
::
updateQuickTraversal
()
inline
void
GenericMap
::
updateQuickTraversal
(
const
FunctorSelect
&
good
)
{
assert
(
m_quickTraversal
[
ORBIT
]
!=
NULL
||
!
"updateQuickTraversal on a disabled orbit"
)
;
CellMarker
<
ORBIT
>
cm
(
*
this
)
;
for
(
Dart
d
=
begin
();
d
!=
end
();
next
(
d
))
{
if
(
!
cm
.
isMarked
(
d
))
if
(
good
(
d
)
&&
!
cm
.
isMarked
(
d
))
{
cm
.
mark
(
d
)
;
(
*
m_quickTraversal
[
ORBIT
])[
getEmbedding
<
ORBIT
>
(
d
)]
=
d
;
...
...
include/Topology/generic/traversorCell.hpp
View file @
37b3cdd9
...
...
@@ -29,30 +29,32 @@ template <typename MAP, unsigned int ORBIT>
TraversorCell
<
MAP
,
ORBIT
>::
TraversorCell
(
MAP
&
map
,
const
FunctorSelect
&
good
,
bool
forceDartMarker
,
unsigned
int
thread
)
:
m
(
map
),
dmark
(
NULL
),
cmark
(
NULL
),
current
(
NIL
),
firstTraversal
(
true
),
m_good
(
good
)
{
quickTraversal
=
map
.
template
getQuickTraversal
<
ORBIT
>()
;
if
(
quickTraversal
!=
NULL
)
{
cont
=
&
(
m
.
template
getAttributeContainer
<
ORBIT
>())
;
}
if
(
forceDartMarker
)
dmark
=
new
DartMarker
(
map
,
thread
)
;
else
{
if
(
!
forceDartMarker
&&
map
.
template
isOrbitEmbedded
<
ORBIT
>())
cmark
=
new
CellMarker
<
ORBIT
>
(
map
,
thread
)
;
quickTraversal
=
map
.
template
getQuickTraversal
<
ORBIT
>()
;
if
(
quickTraversal
!=
NULL
)
{
cont
=
&
(
m
.
template
getAttributeContainer
<
ORBIT
>())
;
}
else
dmark
=
new
DartMarker
(
map
,
thread
)
;
{
if
(
map
.
template
isOrbitEmbedded
<
ORBIT
>())
cmark
=
new
CellMarker
<
ORBIT
>
(
map
,
thread
)
;
else
dmark
=
new
DartMarker
(
map
,
thread
)
;
}
}
}
template
<
typename
MAP
,
unsigned
int
ORBIT
>
TraversorCell
<
MAP
,
ORBIT
>::~
TraversorCell
()
{
if
(
quickTraversal
==
NULL
)
{
if
(
dmark
)
delete
dmark
;
else
delete
cmark
;
}
if
(
dmark
)
delete
dmark
;
else
if
(
cmark
)
delete
cmark
;
}
template
<
typename
MAP
,
unsigned
int
ORBIT
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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