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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
16b913c1
Commit
16b913c1
authored
Nov 16, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correctifs bijectiveOrbitEmbedding et closeHole
parent
1b28477f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
12 deletions
+15
-12
src/Topology/generic/attribmap.cpp
src/Topology/generic/attribmap.cpp
+8
-8
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+7
-4
No files found.
src/Topology/generic/attribmap.cpp
View file @
16b913c1
...
...
@@ -25,6 +25,7 @@
#include "Topology/generic/attribmap.h"
#include "Topology/generic/autoAttributeHandler.h"
#include "Topology/generic/dartmarker.h"
namespace
CGoGN
{
...
...
@@ -54,7 +55,6 @@ void AttribMap::clear(bool removeAttrib)
init
()
;
}
/****************************************
* UTILITIES *
****************************************/
...
...
@@ -72,8 +72,8 @@ void AttribMap::bijectiveOrbitEmbedding(unsigned int orbit)
{
assert
(
isOrbitEmbedded
(
orbit
)
||
!
"Invalid parameter: orbit not embedded"
)
;
AutoAttributeHandler
<
int
>
counter
(
*
this
,
VERTEX
)
;
counter
.
setAllValues
(
int
(
0
));
AutoAttributeHandler
<
int
>
counter
(
*
this
,
orbit
)
;
counter
.
setAllValues
(
int
(
0
))
;
DartMarker
mark
(
*
this
)
;
for
(
Dart
d
=
begin
();
d
!=
end
();
next
(
d
))
...
...
@@ -81,19 +81,19 @@ void AttribMap::bijectiveOrbitEmbedding(unsigned int orbit)
if
(
!
mark
.
isMarked
(
d
))
{
mark
.
markOrbit
(
orbit
,
d
)
;
unsigned
int
emb
=
getEmbedding
(
orbit
,
d
);
unsigned
int
emb
=
getEmbedding
(
orbit
,
d
)
;
if
(
emb
!=
EMBNULL
)
{
if
(
counter
[
d
]
>
0
)
if
(
counter
[
d
]
>
0
)
{
unsigned
int
newEmb
=
embedNewCell
(
orbit
,
d
)
;
copyCell
(
VERTEX
,
newEmb
,
emb
)
;
copyCell
(
orbit
,
newEmb
,
emb
)
;
}
counter
[
d
]
++
;
counter
[
d
]
++
;
}
}
}
}
}
// namespace CGoGN
src/Topology/map/map2.cpp
View file @
16b913c1
...
...
@@ -379,7 +379,7 @@ bool Map2::collapseDegeneratedFace(Dart d)
if
(
e2
!=
e
)
phi2unsew
(
e
);
if
(
d2
!=
d
&&
e2
!=
e
)
phi2sew
(
d2
,
e2
);
deleteCycle
(
d
);
// Delete the single edge or two edges of the loop
deleteCycle
(
d
);
// Delete the single edge or two edges of the loop
return
true
;
}
return
false
;
...
...
@@ -974,13 +974,16 @@ unsigned int Map2::closeHole(Dart d, bool forboundary)
}
}
while
(
dPhi1
!=
d
);
if
(
countEdges
==
2
)
if
(
countEdges
<
3
)
{
countEdges
=
0
;
collapseDegeneratedFace
(
first
);
// if the closing face is 2-sided, collapse it
}
boundaryMarkOrbit
(
FACE
,
phi2
(
d
));
else
{
if
(
forboundary
)
boundaryMarkOrbit
(
FACE
,
phi2
(
d
));
}
return
countEdges
;
}
...
...
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