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
887a19c7
Commit
887a19c7
authored
Sep 12, 2012
by
Basile Sauvage
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
voronoi centroidaux
parent
4b7fbbef
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
40 deletions
+23
-40
include/Algo/Geometry/voronoiDiagrams.hpp
include/Algo/Geometry/voronoiDiagrams.hpp
+23
-40
No files found.
include/Algo/Geometry/voronoiDiagrams.hpp
View file @
887a19c7
...
...
@@ -140,7 +140,7 @@ void VoronoiDiagram<PFP>::computeDiagram ()
template
<
typename
PFP
>
void
VoronoiDiagram
<
PFP
>::
computeDistancesWithinRegion
(
Dart
seed
)
{
// TODO : this algo has not yet been tested
{
// init
front
.
clear
();
vmReached
.
unmarkAll
();
...
...
@@ -257,31 +257,6 @@ unsigned int CentroidalVoronoiDiagram<PFP>::moveSeedsOneEdgeNoCheck(){
return
m
;
}
template
<
typename
PFP
>
unsigned
int
CentroidalVoronoiDiagram
<
PFP
>::
moveSeedsOneEdgeCheck
(){
// TODO : probable bug (memoire ?) car les iterations ralentissent inexplicablement
unsigned
int
m
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
this
->
seeds
.
size
();
i
++
)
{
Dart
oldSeed
=
this
->
seeds
[
i
];
Dart
newSeed
=
selectBestNeighborFromSeed
(
i
);
// move the seed
if
(
newSeed
!=
oldSeed
)
{
REAL
regionEnergy
=
distances
[
oldSeed
];
this
->
computeDistancesWithinRegion
(
newSeed
);
cumulateEnergyFromRoot
(
newSeed
);
if
(
distances
[
newSeed
]
<
regionEnergy
)
{
this
->
seeds
[
i
]
=
newSeed
;
m
++
;
}
}
}
return
m
;
}
/*
template
<
typename
PFP
>
unsigned
int
CentroidalVoronoiDiagram
<
PFP
>::
moveSeedsOneEdgeCheck
(){
// TODO : probable bug (memoire ?) car les iterations ralentissent inexplicablement
...
...
@@ -301,34 +276,42 @@ unsigned int CentroidalVoronoiDiagram<PFP>::moveSeedsOneEdgeCheck(){
if
(
distances
[
newSeed
]
<
regionEnergy
)
m
++
;
else
this->seeds[i] =
new
Seed;
this
->
seeds
[
i
]
=
old
Seed
;
}
}
return
m
;
}
*/
template
<
typename
PFP
>
unsigned
int
CentroidalVoronoiDiagram
<
PFP
>::
moveSeedsToMedioid
(){
unsigned
int
m
=
0
;
/*
for (unsigned int i = 0; i < this->seeds.size(); i++)
for
(
unsigned
int
i
=
0
;
i
<
this
->
seeds
.
size
();
i
++
)
{
Dart oldSeed = this->seeds[i];
Dart newSeed = selectBestNeighborFromSeed(i);
Dart
oldSeed
,
newSeed
;
unsigned
int
seedMoved
=
0
;
REAL regionEnergy
= distances[oldSeed]
;
REAL
regionEnergy
;
// move the seed
while (newSeed != oldSeed)
do
{
this->cumulateEnergyAndGradientFromSeed(numSeed);
cumulateEnergyFromRoot(newSeed);
oldSeed
=
this
->
seeds
[
i
];
regionEnergy
=
distances
[
oldSeed
];
newSeed
=
selectBestNeighborFromSeed
(
i
);
this
->
seeds
[
i
]
=
newSeed
;
this
->
computeDistancesWithinRegion
(
newSeed
);
cumulateEnergyAndGradientFromSeed
(
i
);
if
(
distances
[
newSeed
]
<
regionEnergy
)
seedMoved
=
1
;
else
{
this->seeds[i] =
new
Seed;
m++
;
this
->
seeds
[
i
]
=
old
Seed
;
newSeed
=
oldSeed
;
}
}
} */
}
while
(
newSeed
!=
oldSeed
);
m
+=
seedMoved
;
}
return
m
;
}
...
...
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