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
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
8425dfda
Commit
8425dfda
authored
Apr 30, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quick traversals
parent
c67517a7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
115 additions
and
23 deletions
+115
-23
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+22
-0
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+46
-0
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+4
-0
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+42
-23
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+1
-0
No files found.
include/Topology/generic/genericmap.h
View file @
8425dfda
...
...
@@ -85,6 +85,12 @@ protected:
*/
AttributeMultiVector
<
unsigned
int
>*
m_embeddings
[
NB_ORBITS
]
;
/**
* Direct access to quick traversal attributes
* (initialized by enableQuickTraversal function)
*/
AttributeMultiVector
<
Dart
>*
m_quickTraversal
[
NB_ORBITS
]
;
/**
* Marks manager
*/
...
...
@@ -370,6 +376,22 @@ public:
template
<
unsigned
int
ORBIT
>
void
initCell
(
unsigned
int
i
)
;
/****************************************
* QUICK TRAVERSAL MANAGEMENT *
****************************************/
template
<
unsigned
int
ORBIT
>
void
enableQuickTraversal
()
;
template
<
unsigned
int
ORBIT
>
void
updateQuickTraversal
()
;
template
<
unsigned
int
ORBIT
>
AttributeMultiVector
<
Dart
>*
getQuickTraversal
()
;
template
<
unsigned
int
ORBIT
>
void
disableQuickTraversal
()
;
/****************************************
* ATTRIBUTES MANAGEMENT *
****************************************/
...
...
include/Topology/generic/genericmap.hpp
View file @
8425dfda
...
...
@@ -352,6 +352,52 @@ inline void GenericMap::initCell(unsigned int i)
m_attribs
[
ORBIT
].
initLine
(
i
)
;
}
/****************************************
* QUICK TRAVERSAL MANAGEMENT *
****************************************/
template
<
unsigned
int
ORBIT
>
inline
void
GenericMap
::
enableQuickTraversal
()
{
if
(
m_quickTraversal
[
ORBIT
]
==
NULL
)
{
if
(
!
isOrbitEmbedded
<
ORBIT
>
())
addEmbedding
<
ORBIT
>
()
;
m_quickTraversal
[
ORBIT
]
=
m_attribs
[
ORBIT
].
addAttribute
<
Dart
>
(
"quick_traversal"
)
;
}
updateQuickTraversal
<
ORBIT
>
()
;
}
template
<
unsigned
int
ORBIT
>
inline
void
GenericMap
::
updateQuickTraversal
()
{
CellMarker
<
ORBIT
>
cm
;
for
(
Dart
d
=
begin
();
d
!=
end
();
next
(
d
))
{
if
(
!
cm
.
isMarked
(
d
))
{
cm
.
mark
(
d
)
;
(
*
m_quickTraversal
[
ORBIT
])[
d
.
index
]
=
d
;
}
}
}
template
<
unsigned
int
ORBIT
>
inline
AttributeMultiVector
<
Dart
>*
GenericMap
::
getQuickTraversal
()
{
return
m_quickTraversal
[
ORBIT
]
;
}
template
<
unsigned
int
ORBIT
>
inline
void
GenericMap
::
disableQuickTraversal
()
{
if
(
m_quickTraversal
[
ORBIT
]
!=
NULL
)
{
m_attribs
[
ORBIT
].
removeAttribute
<
Dart
>
(
m_quickTraversal
[
ORBIT
]
->
getIndex
())
;
m_quickTraversal
[
ORBIT
]
=
NULL
;
}
}
/****************************************
* ATTRIBUTES MANAGEMENT *
****************************************/
...
...
include/Topology/generic/traversorCell.h
View file @
8425dfda
...
...
@@ -37,8 +37,12 @@ class TraversorCell
{
private:
MAP
&
m
;
AttributeContainer
*
cont
;
DartMarker
*
dmark
;
CellMarker
<
ORBIT
>*
cmark
;
AttributeMultiVector
<
Dart
>*
quickTraversal
;
Dart
current
;
bool
firstTraversal
;
const
FunctorSelect
&
m_good
;
...
...
include/Topology/generic/traversorCell.hpp
View file @
8425dfda
...
...
@@ -29,47 +29,66 @@ 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
)
{
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
(
!
forceDartMarker
&&
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
(
dmark
)
delete
dmark
;
else
delete
cmark
;
if
(
quickTraversal
==
NULL
)
{
if
(
dmark
)
delete
dmark
;
else
delete
cmark
;
}
}
template
<
typename
MAP
,
unsigned
int
ORBIT
>
Dart
TraversorCell
<
MAP
,
ORBIT
>::
begin
()
{
if
(
!
firstTraversal
)
if
(
quickTraversal
!=
NULL
)
{
if
(
dmark
)
dmark
->
unmarkAll
()
;
else
cmark
->
unmarkAll
()
;
current
=
(
*
quickTraversal
)[
cont
->
begin
()]
;
}
current
=
m
.
begin
()
;
while
(
current
!=
m
.
end
()
&&
(
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
{
if
(
dmark
)
dmark
->
markOrbit
<
ORBIT
>
(
current
)
;
if
(
!
firstTraversal
)
{
if
(
dmark
)
dmark
->
unmarkAll
()
;
else
cmark
->
unmarkAll
()
;
}
current
=
m
.
begin
()
;
while
(
current
!=
m
.
end
()
&&
(
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
cmark
->
mark
(
current
)
;
{
if
(
dmark
)
dmark
->
markOrbit
<
ORBIT
>
(
current
)
;
else
cmark
->
mark
(
current
)
;
}
firstTraversal
=
false
;
}
firstTraversal
=
false
;
return
current
;
}
...
...
src/Topology/generic/genericmap.cpp
View file @
8425dfda
...
...
@@ -73,6 +73,7 @@ GenericMap::GenericMap() : m_nbThreads(1)
m_attribs
[
i
].
setOrbit
(
i
)
;
m_attribs
[
i
].
setRegistry
(
m_attributes_registry_map
)
;
m_embeddings
[
i
]
=
NULL
;
m_quickTraversal
[
i
]
=
NULL
;
for
(
unsigned
int
j
=
0
;
j
<
NB_THREAD
;
++
j
)
{
m_marksets
[
i
][
j
].
clear
()
;
...
...
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