* roland/constrained-connectivity.cc: Here.
* roland/alexandre: Remove symlink.
---
milena/sandbox/ChangeLog | 7 +++++++
milena/sandbox/roland/alexandre | 1 -
milena/sandbox/roland/constrained-connectivity.cc | 7 +++----
3 files changed, 10 insertions(+), 5 deletions(-)
delete mode 120000 milena/sandbox/roland/alexandre
diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog
index d087c07..7f9554a 100644
--- a/milena/sandbox/ChangeLog
+++ b/milena/sandbox/ChangeLog
@@ -1,5 +1,12 @@
2009-09-24 Roland Levillain <roland(a)lrde.epita.fr>
+ Use Milena's topological WST instead of the one from the sandboxes.
+
+ * roland/constrained-connectivity.cc: Here.
+ * roland/alexandre: Remove symlink.
+
+2009-09-24 Roland Levillain <roland(a)lrde.epita.fr>
+
Catch up with new 2D inter-pixel neighborhoods names.
* roland/constrained-connectivity.cc (main): s/e2c/e2v/.
diff --git a/milena/sandbox/roland/alexandre b/milena/sandbox/roland/alexandre
deleted file mode 120000
index 5edb140..0000000
--- a/milena/sandbox/roland/alexandre
+++ /dev/null
@@ -1 +0,0 @@
-../abraham/mln/morpho/
\ No newline at end of file
diff --git a/milena/sandbox/roland/constrained-connectivity.cc
b/milena/sandbox/roland/constrained-connectivity.cc
index 7dee1d6..59009b7 100644
--- a/milena/sandbox/roland/constrained-connectivity.cc
+++ b/milena/sandbox/roland/constrained-connectivity.cc
@@ -76,8 +76,7 @@
#include <mln/world/inter_pixel/compute.hh>
#include <mln/world/inter_pixel/neighb2d.hh>
-// From Alexandre Abraham's sandbox.
-#include <alexandre/topo_wst.hh>
+#include <mln/morpho/watershed/topological.hh>
#include <mln/morpho/tree/compute_attribute_image.hh>
#include <mln/accu/stat/min.hh>
@@ -129,10 +128,10 @@ int main(int argc, char* argv[])
debug::println("g:", g);
// Compute a topological watershed transform on this gradient.
- typedef morpho::topo_wst<g_t, world::inter_pixel::dbl_neighb2d> tree_t;
+ typedef morpho::watershed::topo_wst<g_t, world::inter_pixel::dbl_neighb2d>
tree_t;
tree_t tree(g, world::inter_pixel::e2e());
tree.go();
- mln_VAR(w, morpho::topo_watershed(tree));
+ mln_VAR(w, morpho::watershed::topological(tree));
debug::println("w:", w);
// Computing the set of values of W.
--
1.6.4.4
Show replies by date