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
e00046db
Commit
e00046db
authored
Sep 11, 2012
by
Basile Sauvage
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deuxieme algo voronoi centroidaux
parent
7acfd5c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
1 deletion
+24
-1
include/Algo/Geometry/voronoiDiagrams.hpp
include/Algo/Geometry/voronoiDiagrams.hpp
+24
-1
No files found.
include/Algo/Geometry/voronoiDiagrams.hpp
View file @
e00046db
...
...
@@ -219,7 +219,6 @@ void CentroidalVoronoiDiagram<PFP>::cumulateEnergyOnPaths(){
template
<
typename
PFP
>
unsigned
int
CentroidalVoronoiDiagram
<
PFP
>::
moveSeeds
(){
// TODO : je pense qu'il y a un bug : ça devrait convergerger bien mieux en n'utilisant que l'energie globale comme critere d'arret
unsigned
int
m
=
0
;
globalEnergy
=
0.0
;
for
(
unsigned
int
i
=
0
;
i
<
this
->
seeds
.
size
();
i
++
)
...
...
@@ -231,6 +230,30 @@ unsigned int CentroidalVoronoiDiagram<PFP>::moveSeeds(){
return
m
;
}
template
<
typename
PFP
>
unsigned
int
CentroidalVoronoiDiagram
<
PFP
>::
moveSeeds2
(){
unsigned
int
m
=
0
;
globalEnergy
=
0.0
;
for
(
unsigned
int
i
=
0
;
i
<
this
->
seeds
.
size
();
i
++
)
{
Dart
oldSeed
=
this
->
seeds
[
i
];
int
r
=
moveSeed
(
i
);
Dart
newSeed
=
this
->
seeds
[
i
];
globalEnergy
+=
distances
[
oldSeed
];
REAL
regionEnergy
=
distances
[
oldSeed
];
if
(
r
==
1
)
{
this
->
computeDistancesWithinRegion
(
newSeed
);
cumulateEnergyFromRoot
(
newSeed
);
if
(
distances
[
newSeed
]
<
regionEnergy
)
m
+=
1
;
else
this
->
seeds
[
i
]
=
oldSeed
;
}
}
return
m
;
}
template
<
typename
PFP
>
typename
PFP
::
REAL
CentroidalVoronoiDiagram
<
PFP
>::
cumulateEnergyFromRoot
(
Dart
e
){
REAL
distArea
=
areaElts
[
e
]
*
distances
[
e
];
...
...
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