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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
01ef1b3d
Commit
01ef1b3d
authored
Nov 29, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug in curvature parallel computing
parent
2b2df40a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+3
-3
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+8
-0
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+17
-0
No files found.
include/Algo/Geometry/curvature.hpp
View file @
01ef1b3d
...
...
@@ -440,17 +440,17 @@ void computeCurvatureVertices_NormalCycles(
if
(
!
map
.
template
isOrbitEmbedded
<
VERTEX
>())
{
CellMarkerNoUnmark
<
VERTEX
>
cm
(
map
);
map
.
template
init
Orbit
Embedding
<
VERTEX
>();
map
.
template
init
AllOrbits
Embedding
<
VERTEX
>();
}
if
(
!
map
.
template
isOrbitEmbedded
<
EDGE
>())
{
CellMarkerNoUnmark
<
EDGE
>
cm
(
map
);
map
.
template
init
Orbit
Embedding
<
EDGE
>();
map
.
template
init
AllOrbits
Embedding
<
EDGE
>();
}
if
(
!
map
.
template
isOrbitEmbedded
<
FACE
>())
{
CellMarkerNoUnmark
<
FACE
>
cm
(
map
);
map
.
template
init
Orbit
Embedding
<
FACE
>();
map
.
template
init
AllOrbits
Embedding
<
FACE
>();
}
FunctorComputeCurvatureVertices_NormalCycles
<
PFP
>
funct
(
map
,
radius
,
position
,
normal
,
edgeangle
,
kmax
,
kmin
,
Kmax
,
Kmin
,
Knormal
);
...
...
include/Topology/generic/genericmap.h
View file @
01ef1b3d
...
...
@@ -438,6 +438,14 @@ public:
template
<
unsigned
int
ORBIT
>
void
initCell
(
unsigned
int
i
)
;
/**
* Traverse the map and embed all orbits of the given dimension with a new cell
* @param realloc if true -> all the orbits are embedded on new cells, if false -> already embedded orbits are not impacted
*/
template
<
unsigned
int
ORBIT
>
void
initAllOrbitsEmbedding
(
bool
realloc
=
false
)
;
/****************************************
* QUICK TRAVERSAL MANAGEMENT *
****************************************/
...
...
include/Topology/generic/genericmap.hpp
View file @
01ef1b3d
...
...
@@ -419,6 +419,23 @@ inline void GenericMap::initCell(unsigned int i)
m_attribs
[
ORBIT
].
initLine
(
i
)
;
}
template
<
unsigned
int
ORBIT
>
void
GenericMap
::
initAllOrbitsEmbedding
(
bool
realloc
)
{
assert
(
isOrbitEmbedded
<
ORBIT
>
()
||
!
"Invalid parameter: orbit not embedded"
)
;
DartMarker
mark
(
*
this
)
;
for
(
Dart
d
=
begin
();
d
!=
end
();
next
(
d
))
{
if
(
!
mark
.
isMarked
(
d
))
{
mark
.
markOrbit
<
ORBIT
>
(
d
)
;
if
(
realloc
||
getEmbedding
<
ORBIT
>
(
d
)
==
EMBNULL
)
setOrbitEmbeddingOnNewCell
<
ORBIT
>
(
d
)
;
}
}
}
/****************************************
* QUICK TRAVERSAL MANAGEMENT *
****************************************/
...
...
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