Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-242-g082d9ae New app: binary OFF to VTK mesh conversion.

by Roland Levillain

* apps/mesh-segm-skel/off-to-vtk-bin.cc: New. * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add off-to-vtk-bin. (off_to_vtk_bin_SOURCES): New. --- milena/ChangeLog | 9 +++ milena/apps/mesh-segm-skel/Makefile.am | 9 +++ .../mesh-segm-skel/off-to-vtk-bin.cc} | 52 ++++++++++---------- 3 files changed, 44 insertions(+), 26 deletions(-) copy milena/{sandbox/theo/tufa_2008/gradient.cc => apps/mesh-segm-skel/off-to-vtk-bin.cc} (62%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 010bf56..57fa1a1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + New app: binary OFF to VTK mesh conversion. + + * apps/mesh-segm-skel/off-to-vtk-bin.cc: New. + * apps/mesh-segm-skel/Makefile.am + (bin_PROGRAMS): Add off-to-vtk-bin. + (off_to_vtk_bin_SOURCES): New. + +2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + New app performing a 2-collapse on a mesh. * apps/mesh-segm-skel/mesh-complex-2-collapse.cc: New. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index d68ae7c..1b4d20f 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -236,3 +236,12 @@ TESTS += test-mesh-complex-pinv-curv-skel MOSTLYCLEANFILES += \ socket-complex-pinv-curv-skel.off \ teapot-complex-pinv-curv-skel.off + +## ------------------------- ## +## Conversion applications. ## +## ------------------------- ## + +# Convert a binary OFF file (e.g. no value attached to faces) into a +# VTK file. +bin_PROGRAMS += off-to-vtk-bin +off_to_vtk_bin_SOURCES = off-to-vtk-bin.cc diff --git a/milena/sandbox/theo/tufa_2008/gradient.cc b/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc similarity index 62% copy from milena/sandbox/theo/tufa_2008/gradient.cc copy to milena/apps/mesh-segm-skel/off-to-vtk-bin.cc index 31c308e..926da7d 100644 --- a/milena/sandbox/theo/tufa_2008/gradient.cc +++ b/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,36 +25,36 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file sandbox/geraud/tufa/gradient.cc +/// \file -#include <mln/core/image/image2d.hh> -#include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> -#include <mln/core/alias/neighb2d.hh> +/// \brief A program converting a binary OFF file (e.g. no value +/// attached to faces) into a VTK file. -#include <mln/morpho/elementary/gradient.hh> +#include <iostream> +#include <mln/io/off/load.hh> +#include <mln/io/vtk/save.hh> -void usage(char* argv[]) +int +main(int argc, char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.pgm output.pgm" << std::endl; - std::cerr << "elementary gradient with c4" << std::endl; - std::abort(); -} - - -int main(int argc, char* argv[]) -{ - using namespace mln; - using value::int_u8; - if (argc != 3) - usage(argv); - - image2d<int_u8> f; - io::pgm::load(f, argv[1]); - io::pgm::save(morpho::elementary::gradient(f, c4()), - argv[2]); + { + std::cerr << "usage: " << argv[0] << " input.off output.vtk" + << std::endl; + std::exit(1); + } + + std::string input_filename = argv[1]; + std::string output_filename = argv[2]; + + typedef mln::bin_2complex_image3df ima_t; + ima_t ima; + + // FIXME: Converting bunny-holefilled.off to VTK took 30 sec, which + // is awfully slow. Time the load and save operations and find + // where is (are) the issue(s). + mln::io::off::load(ima, input_filename); + mln::io::vtk::save(ima, output_filename); } -- 1.5.6.5

13 years, 9 months

last-svn-commit-212-g004dc21 Get rid of intermediate psites in thinning algorithms.

by Roland Levillain

* mln/topo/skeleton/breadth_first_thinning.hh, * mln/topo/skeleton/priority_driven_thinning.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/topo/skeleton/breadth_first_thinning.hh | 16 ++++------------ .../mln/topo/skeleton/priority_driven_thinning.hh | 16 ++++------------ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e0532ab..9a2bbcc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-09-19 Roland Levillain <roland(a)lrde.epita.fr> + Get rid of intermediate psites in thinning algorithms. + + * mln/topo/skeleton/breadth_first_thinning.hh, + * mln/topo/skeleton/priority_driven_thinning.hh: + Here. + +2010-09-19 Roland Levillain <roland(a)lrde.epita.fr> + Have topo::is_n_face take a psite type as class parameter. * mln/topo/is_n_face.hh: Here, so that the argument of this diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index d2f33b5..286e3e0 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -119,15 +119,9 @@ namespace mln typedef p_queue_fast<psite> queue_t; queue_t queue; // Populate QUEUE with candidate simple points. - mln_piter(I) p_(output.domain()); - for_all(p_) + mln_piter(I) p(output.domain()); + for_all(p) { - /* CONSTRAINTS and IS_SIMPLE are site-to-boolean (p2b) - predicate functors; passing an iterator as argument might - not be possible (C++ cannot resolve template routines if - an implicit conversion of the argument is needed). Help - the compiler and pass an actual, explicit psite. */ - psite p = p_; if (output(p) && constraint(p) && is_simple(p)) queue.push(p); } @@ -138,11 +132,9 @@ namespace mln if (output(p) && constraint(p) && is_simple(p)) { detach(p, output); - mln_niter(N) n_(nbh, p); - for_all(n_) + mln_niter(N) n(nbh, p); + for_all(n) { - // Same remark as above regarding P and P_. - psite n = n_; if (output.domain().has(n) && output(n) && constraint(n) && is_simple(n)) queue.push(n); diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh index 42e1b13..cacc575 100644 --- a/milena/mln/topo/skeleton/priority_driven_thinning.hh +++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh @@ -129,15 +129,9 @@ namespace mln typedef p_priority<mln_value(J), queue_t> priority_queue_t; priority_queue_t queue; // Populate QUEUE with candidate simple points. - mln_piter(I) p_(output.domain()); - for_all(p_) + mln_piter(I) p(output.domain()); + for_all(p) { - /* CONSTRAINTS and IS_SIMPLE are site-to-boolean (p2b) - predicate functors; passing an iterator as argument might - not be possible (C++ cannot resolve template routines if - an implicit conversion of the argument is needed). Help - the compiler and pass an actual, explicit psite. */ - psite p = p_; if (output(p) && constraint(p) && is_simple(p)) queue.push(priority(p), p); } @@ -148,11 +142,9 @@ namespace mln if (output(p) && constraint(p) && is_simple(p)) { detach(p, output); - mln_niter(N) n_(nbh, p); - for_all(n_) + mln_niter(N) n(nbh, p); + for_all(n) { - // Same remark as above regarding P and P_. - psite n = n_; if (output.domain().has(n) && output(n) && constraint(n) && is_simple(n)) queue.push(priority(n), n); -- 1.5.6.5

13 years, 9 months

last-svn-commit-213-ga6b48d3 Get the `detach' argument of thinning algorithms by reference.

by Roland Levillain

* mln/topo/skeleton/breadth_first_thinning.hh (topo::skeleton::breadth_first_thinning) * mln/topo/skeleton/priority_driven_thinning.hh (topo::skeleton::priority_driven_thinning): Here. --- milena/ChangeLog | 10 ++++++++++ milena/mln/topo/skeleton/breadth_first_thinning.hh | 8 ++++---- .../mln/topo/skeleton/priority_driven_thinning.hh | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9a2bbcc..373d9fa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2010-09-20 Roland Levillain <roland(a)lrde.epita.fr> + + Get the `detach' argument of thinning algorithms by reference. + + * mln/topo/skeleton/breadth_first_thinning.hh + (topo::skeleton::breadth_first_thinning) + * mln/topo/skeleton/priority_driven_thinning.hh + (topo::skeleton::priority_driven_thinning): + Here. + 2010-09-19 Roland Levillain <roland(a)lrde.epita.fr> Get rid of intermediate psites in thinning algorithms. diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index 286e3e0..7401bae 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -69,7 +69,7 @@ namespace mln breadth_first_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach, + G& detach, const Function_v2b<H>& constraint); @@ -90,7 +90,7 @@ namespace mln breadth_first_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach); + G& detach); # ifndef MLN_INCLUDE_ONLY @@ -101,7 +101,7 @@ namespace mln breadth_first_thinning(const Image& input_, const Neighborhood<N>& nbh_, Function_v2b<F>& is_simple_, - G detach, + G& detach, const Function_v2b<H>& constraint_) { trace::entering("topo::skeleton::breadth_first_thinning"); @@ -153,7 +153,7 @@ namespace mln breadth_first_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach) + G& detach) { return breadth_first_thinning(input, nbh, is_simple, detach, fun::p2b::tautology()); diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh index cacc575..e29062f 100644 --- a/milena/mln/topo/skeleton/priority_driven_thinning.hh +++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh @@ -72,7 +72,7 @@ namespace mln priority_driven_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach, + G& detach, const Image<J>& priority, const Function_v2b<H>& constraint); @@ -95,7 +95,7 @@ namespace mln priority_driven_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach, + G& detach, const Image<J>& priority); @@ -108,7 +108,7 @@ namespace mln priority_driven_thinning(const Image& input_, const Neighborhood<N>& nbh_, Function_v2b<F>& is_simple_, - G detach, + G& detach, const Image<J>& priority_, const Function_v2b<H>& constraint_) { @@ -163,7 +163,7 @@ namespace mln priority_driven_thinning(const Image& input, const Neighborhood<N>& nbh, Function_v2b<F>& is_simple, - G detach, + G& detach, const Image<J>& priority) { return priority_driven_thinning(input, nbh, is_simple, detach, -- 1.5.6.5

13 years, 9 months

last-svn-commit-214-g3076fae Introduce an extension-by-mutable-image morpher.

by Roland Levillain

* mln/core/image/dmorph/mutable_extension_ima.hh: New. * headers.mk: Regen. --- milena/ChangeLog | 7 ++ milena/headers.mk | 1 + .../{extension_ima.hh => mutable_extension_ima.hh} | 92 +++++++++----------- 3 files changed, 51 insertions(+), 49 deletions(-) copy milena/mln/core/image/dmorph/{extension_ima.hh => mutable_extension_ima.hh} (68%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 373d9fa..c6f99c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Introduce an extension-by-mutable-image morpher. + + * mln/core/image/dmorph/mutable_extension_ima.hh: New. + * headers.mk: Regen. + 2010-09-20 Roland Levillain <roland(a)lrde.epita.fr> Get the `detach' argument of thinning algorithms by reference. diff --git a/milena/headers.mk b/milena/headers.mk index 90dd918..a08fbfa 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -277,6 +277,7 @@ mln/core/image/dmorph/hexa.hh \ mln/core/image/dmorph/hexa_piter.hh \ mln/core/image/dmorph/image2d_h.hh \ mln/core/image/dmorph/image_if.hh \ +mln/core/image/dmorph/mutable_extension_ima.hh \ mln/core/image/dmorph/p2p_image.hh \ mln/core/image/dmorph/slice_image.hh \ mln/core/image/dmorph/sub_image.hh \ diff --git a/milena/mln/core/image/dmorph/extension_ima.hh b/milena/mln/core/image/dmorph/mutable_extension_ima.hh similarity index 68% copy from milena/mln/core/image/dmorph/extension_ima.hh copy to milena/mln/core/image/dmorph/mutable_extension_ima.hh index a0bc9ca..f208581 100644 --- a/milena/mln/core/image/dmorph/extension_ima.hh +++ b/milena/mln/core/image/dmorph/mutable_extension_ima.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -24,13 +24,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH -# define MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH +#ifndef MLN_CORE_IMAGE_DMORPH_MUTABLE_EXTENSION_IMA_HH +# define MLN_CORE_IMAGE_DMORPH_MUTABLE_EXTENSION_IMA_HH /// \file /// /// Definition of a morpher that extends the domain of an image -/// with an image. +/// with a readable and writable (rw) image. # include <mln/core/internal/image_identity.hh> @@ -40,17 +40,17 @@ namespace mln { // Forward declaration. - template <typename I, typename J> struct extension_ima; + template <typename I, typename J> struct mutable_extension_ima; namespace internal { - /// Data structure for \c mln::extension_ima<I, J>. + /// Data structure for \c mln::mutable_extension_ima<I, J>. template <typename I, typename J> - struct data< extension_ima<I, J> > + struct data< mutable_extension_ima<I, J> > { - data(I& ima, const J& ext); + data(I& ima, J& ext); I ima_; J ext_; @@ -63,7 +63,7 @@ namespace mln { template <typename I, typename J> - struct image_< extension_ima<I, J> > : image_ // Same as I except... + struct image_< mutable_extension_ima<I, J> > : image_ // Same as I except... { // ...these changes. typedef trait::image::category::identity_morpher category; @@ -77,11 +77,11 @@ namespace mln }; template <typename I, typename J, typename V> - struct ch_value< extension_ima<I, J>, V > + struct ch_value< mutable_extension_ima<I, J>, V > { typedef mlc_converts_to(mln_value(J), V) keep_ext; typedef mln_ch_value(I, V) Iv; - typedef extension_ima<Iv, J> Iv_ext; + typedef mutable_extension_ima<Iv, J> Iv_ext; typedef mlc_if(keep_ext, Iv_ext, Iv) ret; }; @@ -94,15 +94,15 @@ namespace mln /// \ingroup modimagedomainmorpher // template <typename I, typename J> - class extension_ima + class mutable_extension_ima - : public internal::image_identity< I, mln_domain(I), extension_ima<I, J> >, + : public internal::image_identity< I, mln_domain(I), mutable_extension_ima<I, J> >, private mlc_converts_to(mln_value(J), mln_value(I))::check_t { public: /// Skeleton. - typedef extension_ima< tag::image_, tag::ext_<J> > skeleton; + typedef mutable_extension_ima< tag::image_, tag::ext_<J> > skeleton; /// Image value type. typedef mln_value(I) value; @@ -111,14 +111,14 @@ namespace mln typedef mln_value(I) rvalue; /// Constructor without argument. - extension_ima(); + mutable_extension_ima(); /// Constructor from an image \p ima and a function \p ext. - extension_ima(I& ima, const J& ext); + mutable_extension_ima(I& ima, J& ext); /// Deferred initialization from an image \p ima and a function \p /// ext. - void init_(I& ima, const J& ext); + void init_(I& ima, J& ext); /// Test if \p p is valid. @@ -131,52 +131,52 @@ namespace mln mln_value(I) operator()(const mln_psite(I)& p) const; /// Read-write access to the image value located at site \p p. - mln_morpher_lvalue(I) operator()(const mln_psite(I)& p); + mln_lvalue(I) operator()(const mln_psite(I)& p); - /// Read-only access to the extension domain (image). - const J& extension() const; + /// Access to the extension domain (image). + J& extension() ; }; // init_ template <typename I, typename J, typename M> - void init_(tag::image_t, extension_ima<I,J>& target, const M& model); + void init_(tag::image_t, mutable_extension_ima<I,J>& target, const M& model); template <typename J, typename I> - void init_(tag::extension_t, J& target, const extension_ima<I,J>& model); + void init_(tag::extension_t, J& target, const mutable_extension_ima<I,J>& model); # ifndef MLN_INCLUDE_ONLY - // internal::data< extension_ima<I,S> > + // internal::data< mutable_extension_ima<I,S> > namespace internal { template <typename I, typename J> inline - data< extension_ima<I, J> >::data(I& ima, const J& ext) + data< mutable_extension_ima<I, J> >::data(I& ima, J& ext) : ima_(ima), - ext_(const_cast<J&>(ext)) + ext_(ext) { } } // end of namespace mln::internal - // extension_ima<I, J> + // mutable_extension_ima<I, J> template <typename I, typename J> inline - extension_ima<I, J>::extension_ima() + mutable_extension_ima<I, J>::mutable_extension_ima() { } template <typename I, typename J> inline - extension_ima<I, J>::extension_ima(I& ima, const J& ext) + mutable_extension_ima<I, J>::mutable_extension_ima(I& ima, J& ext) { init_(ima, ext); } @@ -184,16 +184,16 @@ namespace mln template <typename I, typename J> inline void - extension_ima<I, J>::init_(I& ima, const J& ext) + mutable_extension_ima<I, J>::init_(I& ima, J& ext) { - this->data_ = new internal::data< extension_ima<I, J> >(ima, ext); + this->data_ = new internal::data< mutable_extension_ima<I, J> >(ima, ext); } template <typename I, typename J> template <typename P> inline bool - extension_ima<I, J>::has(const P& p) const + mutable_extension_ima<I, J>::has(const P& p) const { mln_precondition(this->is_valid()); mln_precondition(this->data_->ext_.is_valid()); @@ -205,7 +205,7 @@ namespace mln template <typename I, typename J> inline mln_value(I) - extension_ima<I, J>::operator()(const mln_psite(I)& p) const + mutable_extension_ima<I, J>::operator()(const mln_psite(I)& p) const { mln_precondition(this->is_valid()); mln_precondition(has(p)); @@ -219,29 +219,23 @@ namespace mln template <typename I, typename J> inline - mln_morpher_lvalue(I) - extension_ima<I, J>::operator()(const mln_psite(I)& p) + mln_lvalue(I) + mutable_extension_ima<I, J>::operator()(const mln_psite(I)& p) { - static mln_value(I) cpy; mln_precondition(this->is_valid()); mln_precondition(has(p)); - // See the above comment about if-else v. ternary. + // if-else is preferred to the ternary op to allow for the + // function result to convert towards the expected return type. if (this->data_->ima_.domain().has(p)) return this->data_->ima_(p); else - { - // This hack makes this signature valid both in the image - // domain and in its extension. It works even if - // mln_morpher_lvalue(I) is a mutable reference. - cpy = this->data_->ext_(p); - return cpy; - } + return this->data_->ext_(p); } template <typename I, typename J> inline - const J& - extension_ima<I, J>::extension() const + J& + mutable_extension_ima<I, J>::extension() { mln_precondition(this->is_valid()); return this->data_->ext_; @@ -251,7 +245,7 @@ namespace mln template <typename I, typename J, typename M> inline - void init_(tag::image_t, extension_ima<I,J>& target, const M& model) + void init_(tag::image_t, mutable_extension_ima<I,J>& target, const M& model) { I ima; init_(tag::image, ima, model); @@ -262,10 +256,10 @@ namespace mln template <typename J, typename I> inline - void init_(tag::extension_t, J& target, const extension_ima<I,J>& model) + void init_(tag::extension_t, J& target, const mutable_extension_ima<I,J>& model) { typedef mlc_unconst(J) J_; - J_& ext_ = const_cast<J_&>(model.extension()); + J_& ext_ = const_cast< mutable_extension_ima<I,J>& >(model).extension(); J_& target_ = const_cast<J_&>(target); target_ = ext_; } @@ -275,4 +269,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH +#endif // ! MLN_CORE_IMAGE_DMORPH_MUTABLE_EXTENSION_IMA_HH -- 1.5.6.5

13 years, 9 months

last-svn-commit-215-g5c73804 Introduce a helper to build an mln::mutable_extension_ima.

by Roland Levillain

* mln/core/routine/mutable_extend.hh: New. * headers.mk: Regen. --- milena/ChangeLog | 7 +++ milena/headers.mk | 1 + .../max_sli.hh => core/routine/mutable_extend.hh} | 47 ++++++++++---------- 3 files changed, 31 insertions(+), 24 deletions(-) copy milena/mln/{geom/max_sli.hh => core/routine/mutable_extend.hh} (59%) diff --git a/milena/ChangeLog b/milena/ChangeLog index c6f99c1..c0a7088 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a helper to build an mln::mutable_extension_ima. + + * mln/core/routine/mutable_extend.hh: New. + * headers.mk: Regen. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Introduce an extension-by-mutable-image morpher. * mln/core/image/dmorph/mutable_extension_ima.hh: New. diff --git a/milena/headers.mk b/milena/headers.mk index a08fbfa..6794868 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -371,6 +371,7 @@ mln/core/routine/extend.hh \ mln/core/routine/init.hh \ mln/core/routine/init.hxx \ mln/core/routine/initialize.hh \ +mln/core/routine/mutable_extend.hh \ mln/core/routine/ops.hh \ mln/core/routine/primary.hh \ mln/core/site_set/all.hh \ diff --git a/milena/mln/geom/max_sli.hh b/milena/mln/core/routine/mutable_extend.hh similarity index 59% copy from milena/mln/geom/max_sli.hh copy to milena/mln/core/routine/mutable_extend.hh index cf4fc51..73f2672 100644 --- a/milena/mln/geom/max_sli.hh +++ b/milena/mln/core/routine/mutable_extend.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -24,45 +24,44 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_GEOM_MAX_SLI_HH -# define MLN_GEOM_MAX_SLI_HH +#ifndef MLN_CORE_ROUTINE_MUTABLE_EXTEND_HH +# define MLN_CORE_ROUTINE_MUTABLE_EXTEND_HH /// \file /// -/// Give the maximum sli of an image. +/// Routine to extend a mutable image with a mutable extension. +/// +/// \todo Use the 'instant' mechanism. +/// \todo Deal with ambiguities. +/// \todo Check that there is no extension yet (except "mutable_extendable"). + +# include <mln/core/image/dmorph/mutable_extension_ima.hh> -# include <mln/core/concept/image.hh> -# include <mln/geom/bbox.hh> namespace mln { - namespace geom - { - - /// Give the maximum sli of an image. - template <typename I> - mln_deduce(I, site, coord) max_sli(const Image& ima); + /// Extend a mutable image with a mutable image. + template <typename I, typename J> + mutable_extension_ima<I, J> + mutable_extend(Image& ima, Image<J>& ext); # ifndef MLN_INCLUDE_ONLY - template <typename I> - inline - mln_deduce(I, site, coord) max_sli(const Image& ima) - { - mln_precondition(exact(ima).is_valid()); - mln_deduce(I, site, coord) maxsli = geom::bbox(ima).pmax().sli(); - - return maxsli; - } + template <typename I, typename J> + mutable_extension_ima<I, J> + mutable_extend(Image& ima, Image<J>& ext) + { + mlc_converts_to(mln_value(J), mln_value(I))::check(); + mutable_extension_ima<I, J> tmp(exact(ima), exact(ext)); + return tmp; + } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::geom - } // end of namespace mln -#endif // ! MLN_GEOM_MAX_SLI_HH +#endif // ! MLN_CORE_ROUTINE_MUTABLE_EXTEND_HH -- 1.5.6.5

13 years, 9 months

last-svn-commit-216-g7a48c8c More generic breadth-first-thinning-based skeleton transformations.

by Roland Levillain

* mln/topo/is_simple_cell.hh: Make this functor more generic. * mln/topo/detach_cell.hh (detach): Turn this function into a more generic functor. * mln/make/attachment.hh (mln::make::attachment) * mln/make/detachment.hh (mln::make::detachment): Make these routines more generic. * mln/topo/skeleton/breadth_first_thinning.hh (mln::topo::skeleton::breadth_first_thinning): Adjust. * headers.mk: Regen. --- milena/ChangeLog | 15 +++ milena/mln/make/attachment.hh | 48 +++++---- milena/mln/make/detachment.hh | 41 +++++--- milena/mln/topo/detach_cell.hh | 107 ++++++++++++++++--- milena/mln/topo/is_simple_cell.hh | 81 ++++++++------- milena/mln/topo/skeleton/breadth_first_thinning.hh | 18 +++- 6 files changed, 213 insertions(+), 97 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c0a7088..bff25d3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + More generic breadth-first-thinning-based skeleton transformations. + + * mln/topo/is_simple_cell.hh: Make this functor more generic. + * mln/topo/detach_cell.hh (detach): Turn this function into a + more generic functor. + * mln/make/attachment.hh (mln::make::attachment) + * mln/make/detachment.hh (mln::make::detachment): + Make these routines more generic. + * mln/topo/skeleton/breadth_first_thinning.hh + (mln::topo::skeleton::breadth_first_thinning): + Adjust. + * headers.mk: Regen. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a helper to build an mln::mutable_extension_ima. * mln/core/routine/mutable_extend.hh: New. diff --git a/milena/mln/make/attachment.hh b/milena/mln/make/attachment.hh index 088f9df..3af5332 100644 --- a/milena/mln/make/attachment.hh +++ b/milena/mln/make/attachment.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,52 +43,58 @@ namespace mln /** \brief Compute the attachment of the cell corresponding to the facet \a f to the image \a ima. + \param ima The input image to which the facet is attached. + \param f The psite corresponding to the attached facet. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). + + \return A set of faces containing the attachment. + + \pre ima is an image of Boolean values. \pre \a f is a facet (it does not belong to any face of higher dimension). - \pre ima is an image of Boolean values. - - \return a set of faces containing the attachment. We do not use the fomal definition of the attachment here (see couprie.08.pami). We use the following (equivalent) definition: an N-face F in CELL is in the attachment of CELL to IMA if it is adjacent to at least an (N-1)-face or an (N+1)-face that does not belong to CELL. */ - template <unsigned D, typename G, typename V> - p_set< complex_psite<D, G> > - attachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima); + template <typename I, typename N> + p_set<mln_psite(I)> + attachment(const Image& ima, const mln_psite(I)& f, + const Neighborhood<N>& nbh); # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G, typename V> + template <typename I, typename N> inline - p_set< complex_psite<D, G> > - attachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima) + p_set<mln_psite(I)> + attachment(const Image& ima_, const mln_psite(I)& f, + const Neighborhood<N>& nbh_) { mln_precondition(topo::is_facet(f)); - mlc_equal(V, bool)::check(); + mlc_equal(mln_value(I), bool)::check(); + + I ima = exact(ima_); + N nbh = exact(nbh_); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; faces_t f_hat = make::cell(f); - faces_t att_f; + faces_t attach_f; - typedef complex_lower_higher_neighborhood<D, G> adj_nbh_t; - adj_nbh_t adj_nbh; mln_piter(faces_t) g(f_hat); - mln_niter(adj_nbh_t) n(adj_nbh, g); + mln_niter(N) n(nbh, g); for_all(g) for_all(n) if (ima(n) && !f_hat.has(n)) { - att_f.insert(g); + attach_f.insert(g); break; } - return att_f; + return attach_f; } # endif // MLN_INCLUDE_ONLY diff --git a/milena/mln/make/detachment.hh b/milena/mln/make/detachment.hh index 16a8c92..6cd01ba 100644 --- a/milena/mln/make/detachment.hh +++ b/milena/mln/make/detachment.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,12 +43,19 @@ namespace mln /** \brief Compute the detachment of the cell corresponding to the facet \a f from the image \a ima. + \param ima The input image from which the facet is to be + detached. + \param f The psite corresponding to the facet to detach. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). + + \return A set of faces containing the detachment. + \pre \a f is a facet (it does not belong to any face of higher dimension). \pre \a ima is an image of Boolean values. - \return a set of faces containing the detachment. - We do not use the fomal definition of the detachment here (see couprie.08.pami). We use the following (equivalent) definition: an N-face F in CELL is not in the detachment of CELL from IMA if @@ -60,34 +67,34 @@ namespace mln the part that is removed, i.e., the detached part CELL - ATTACHMENT. It would be wise to rename this routine to something else. */ - template <unsigned D, typename G, typename V> - p_set< complex_psite<D, G> > - detachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima); + template <typename I, typename N> + p_set<mln_psite(I)> + detachment(const Image& ima, const mln_psite(I)& f, + const Neighborhood<N>& nbh); # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G, typename V> + template <typename I, typename N> inline - p_set< complex_psite<D, G> > - detachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima) + p_set<mln_psite(I)> + detachment(const Image& ima_, const mln_psite(I)& f, + const Neighborhood<N>& nbh_) { mln_precondition(topo::is_facet(f)); - mlc_equal(V, bool)::check(); + mlc_equal(mln_value(I), bool)::check(); + + I ima = exact(ima_); + N nbh = exact(nbh_); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; faces_t f_hat = make::cell(f); // Initialize DETACH_F to F_HAT. faces_t detach_f = f_hat; - typedef complex_lower_higher_neighborhood<D, G> adj_nbh_t; - adj_nbh_t adj_nbh; mln_piter(faces_t) g(f_hat); - mln_niter(adj_nbh_t) n(adj_nbh, g); + mln_niter(N) n(nbh, g); for_all(g) for_all(n) if (ima(n) && !f_hat.has(n)) diff --git a/milena/mln/topo/detach_cell.hh b/milena/mln/topo/detach_cell.hh index dfc4fb5..9e2a489 100644 --- a/milena/mln/topo/detach_cell.hh +++ b/milena/mln/topo/detach_cell.hh @@ -27,7 +27,7 @@ # define MLN_TOPO_DETACH_CELL_HH /// \file -/// \brief Detaching a cell from a binary complex-based image. +/// \brief Detaching a cell from a binary (probably complex-based) image. # include <mln/core/site_set/p_set.hh> # include <mln/core/image/complex_image.hh> @@ -40,38 +40,111 @@ namespace mln namespace topo { - /** Detach the cell corresponding to \a f from \a ima. + /** A functor detaching a cell from a binary (probably + complex-based) image. - \pre \a f is a facet (it does not belong to any face of higher - dimension). - \pre \a ima is an image of Boolean values. */ - template <unsigned D, typename G> - void - detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima); + \tparam I The type of the image. + \tparam N An neighborhood type corresponding to (directly) + adjacent faces (should return the set of (n-1)- and + (n+1)-faces adjacent to an n-face). */ + template <typename I, typename N> + class detach_cell + { + public: + /// Constructors. + /// \{ + /** Construct an mln::topo::detach_cell from a neighborhood. + + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + detach_cell(const Neighborhood<N>& nbh); + + /** Construct an mln::topo::detach_cell from an image and a + neighborhood. + + \pre \a ima is an image of Boolean values. + + \param ima The input image from which the facet is to be + detached. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + detach_cell(mln::Image& ima, const Neighborhood<N>& nbh); + /// \} + + /* FIXME: Rename as init() or something like this? See how other + functors are written. */ + /** Set the underlying image. + + \pre \a ima is an image of Boolean values. */ + void set_image(mln::Image& ima); + + /** Detach the cell corresponding to \a f from \a ima. + + \pre \a f is a facet (it does not belong to any face of + higher dimension). + + \param f The psite corresponding to the facet to detach. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + void + operator()(const mln_psite(I)& f); + + private: + I* ima_; + const N& nbh_; + }; # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G> + template <typename I, typename N> + inline + detach_cell<I, N>::detach_cell(const Neighborhood<N>& nbh) + : ima_(0), nbh_(exact(nbh)) + { + } + + template <typename I, typename N> + inline + detach_cell<I, N>::detach_cell(mln::Image& ima, + const Neighborhood<N>& nbh) + : ima_(exact(&ima)), nbh_(exact(nbh)) + { + mlc_equal(mln_value(I), bool)::check(); + } + + template <typename I, typename N> + inline + void + detach_cell<I, N>::set_image(mln::Image& ima) + { + mlc_equal(mln_value(I), bool)::check(); + ima_ = exact(&ima); + } + + template <typename I, typename N> inline void - detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima) + detach_cell<I, N>::operator()(const mln_psite(I)& f) { + mln_precondition(ima_); mln_precondition(topo::is_facet(f)); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; - // Compute the detachment of P from IMA. - faces_t detach = make::detachment(f, ima); - // Detach all its faces from IMA. + // Compute the detachment of P from *IMA_. + faces_t detach = make::detachment(*ima_, f, nbh_); + // Detach all its faces from *IMA_. # if 0 // FIXME: Does not work yet? Check again. - data::fill(ima | detach, false); + data::fill(*ima_ | detach, false); # endif mln_piter(faces_t) p(detach); for_all(p) - ima(p) = false; + (*ima_)(p) = false; } # endif // MLN_INCLUDE_ONLY diff --git a/milena/mln/topo/is_simple_cell.hh b/milena/mln/topo/is_simple_cell.hh index a86a8fa..bf60c3d 100644 --- a/milena/mln/topo/is_simple_cell.hh +++ b/milena/mln/topo/is_simple_cell.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,6 @@ # define MLN_TOPO_IS_SIMPLE_CELL_HH /// \file -/// /// \brief Testing whether a facet is a simple cell. # include <mln/core/concept/function.hh> @@ -48,22 +47,29 @@ namespace mln namespace topo { + /* FIXME: Maybe we could add traits to deduce N from NL and NH (or + the converse). Anyway, the part of the code where neighborhood + are used should be moved into another functor + (`is_collapsible', see below), thus pushing away this + issue. */ + /** \brief A predicate for the simplicity of a point based on the collapse property of the attachment. The functor does not actually take a cell as input, but a face - that is expected to be a D-facet. */ - template <typename I> - class is_simple_cell : public mln::Function_v2b< is_simple_cell > + that is expected to be a D-facet. + + \tparam I The type of the image. + \tparam N The neighborhood type returning the set of + (n-1)- and (n+1)-faces adjacent to a an n-face. + \tparam NL The neighborhood type returning the set of + (n-1)-faces adjacent to a an n-face. + \tparam NH The neighborhood type returning the set of + (n+1)-faces adjacent to a an n-face. */ + template <typename I, typename N, typename NL, typename NH> + class is_simple_cell : public mln::Function_v2b< is_simple_cell<I, N, NL, NH> > { public: - /// Dimension of the image (and therefore of the complex). - static const unsigned D = I::dim; - /// Geometry of the image. - typedef mln_geom(I) G; - /// Psite type. - typedef mln::complex_psite<D, G> psite; - /// Result type of the functor. typedef bool result; @@ -76,8 +82,11 @@ namespace mln void set_image(const mln::Image& ima); /// Based on the algorithm A2 from couprie.08.pami. - bool operator()(const mln::complex_psite<I::dim,mln_geom(I)>& p) const; - // Tech note: The argument type above is explicit to help g++-3.3. + /* FIXME: We probably broke the compatiblity with g++ 3.3, as it + seems this compiler does not like an indirect type like the + one of the following operator's argument. Check and possibly + improve this. */ + bool operator()(const mln_psite(I)& p) const; private: const I* ima_; @@ -87,44 +96,44 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline - is_simple_cell::is_simple_cell() + is_simple_cell<I, N, NL, NH>::is_simple_cell() : ima_(0) { } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline - is_simple_cell::is_simple_cell(const mln::Image& ima) - : ima_(mln::exact(&ima)) + is_simple_cell<I, N, NL, NH>::is_simple_cell(const mln::Image& ima) + : ima_(exact(&ima)) { } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline void - is_simple_cell::set_image(const mln::Image& ima) + is_simple_cell<I, N, NL, NH>::set_image(const mln::Image& ima) { - ima_ = mln::exact(&ima); + ima_ = exact(&ima); } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline bool - is_simple_cell::operator()(const mln::complex_psite<I::dim,mln_geom(I)>& p) const - // Tech note: The argument type above is explicit to help g++-3.3. + is_simple_cell<I, N, NL, NH>::operator()(const mln_psite(I)& p) const { mln_precondition(ima_); - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; - // Compute the attachment of the cell corresponding to P to he + // Compute the attachment of the cell corresponding to P to the // domain of *IMA_. - faces_t att = make::attachment(p, *ima_); + N adj_nbh; + faces_t att = make::attachment(*ima_, p, adj_nbh); // A cell with an empty attachment is not simple. - /* FIXME: Why does p_set not provide an empty() predicate? */ + /* FIXME: Why p_set does not provide an empty() predicate? */ if (att.nsites() == 0) return false; @@ -134,10 +143,8 @@ namespace mln routine. */ // Try to collapse the attachment (to a single point). { - typedef complex_lower_neighborhood<D, G> lower_adj_nbh_t; - typedef complex_higher_neighborhood<D, G> higher_adj_nbh_t; - lower_adj_nbh_t lower_adj_nbh; - higher_adj_nbh_t higher_adj_nbh; + NL lower_adj_nbh; + NH higher_adj_nbh; while (att.nsites() > 1) { @@ -149,11 +156,11 @@ namespace mln for_all(g) /* G cannot have dimension 0, since we later look for an adjacent face H of lower dimension. */ - if (static_cast<psite>(g).n() > 0) + if (static_cast<mln_psite(I)>(g).n() > 0) { // Check whether G is a facet within ATT. bool g_is_facet = true; - mln_niter(higher_adj_nbh_t) f(higher_adj_nbh, g); + mln_niter(NH) f(higher_adj_nbh, g); for_all(f) if (att.has(f)) { @@ -165,13 +172,13 @@ namespace mln // Look for a face H stricly included in G. bool gh_is_simple_pair = false; - mln_niter(lower_adj_nbh_t) h(lower_adj_nbh, g); + mln_niter(NL) h(lower_adj_nbh, g); for_all(h) { bool h_strictly_in_g = true; if (att.has(h)) { - mln_niter(higher_adj_nbh_t) i(higher_adj_nbh, h); + mln_niter(NH) i(higher_adj_nbh, h); for_all(i) if (i != g && att.has(i)) { diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index 7401bae..121c159 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -61,9 +61,13 @@ namespace mln (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. \param constraint A constraint on point (site); if it returns \c false for a point, this point - will not be removed. */ + will not be removed. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G, typename H> mln_concrete(I) breadth_first_thinning(const Image& input, @@ -83,8 +87,11 @@ namespace mln \param is_simple The predicate on the simplicity of points (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. - \param detach A function used to detach a cell from - \a input. */ + \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G> mln_concrete(I) breadth_first_thinning(const Image& input, @@ -112,8 +119,9 @@ namespace mln const H& constraint = exact(constraint_); mln_concrete(I) output = duplicate(input); - // Attach the work image to IS_SIMPLE. + // Attach the work image to IS_SIMPLE and DETACH. is_simple.set_image(output); + detach.set_image(output); typedef mln_psite(I) psite; typedef p_queue_fast<psite> queue_t; @@ -131,7 +139,7 @@ namespace mln psite p = queue.pop_front(); if (output(p) && constraint(p) && is_simple(p)) { - detach(p, output); + detach(p); mln_niter(N) n(nbh, p); for_all(n) { -- 1.5.6.5

13 years, 9 months

last-svn-commit-217-g65616e2 Update mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Catch up with the new interface of breadth-first thinning and auxiliary routines. --- milena/ChangeLog | 10 +++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 82 ++++++++++++++++---- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 82 ++++++++++++++++---- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 82 ++++++++++++++++---- 4 files changed, 205 insertions(+), 51 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bff25d3..40e876c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Catch up with the new interface of breadth-first thinning and + auxiliary routines. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + More generic breadth-first-thinning-based skeleton transformations. * mln/topo/is_simple_cell.hh: Make this functor more generic. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index edb943e..641b0b4 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -252,31 +254,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index e2bdf45..5096efa 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -257,31 +259,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index b8b7da8..4f5ca78 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -36,7 +36,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -210,31 +212,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } -- 1.5.6.5

13 years, 9 months

last-svn-commit-207-g21a5b46 Add a pre-allocation routine to mln::geom::complex_geometry.

by Roland Levillain

* mln/geom/complex_geometry.hh (mln::geom::complex_geometry<D, P>::reserve): New. Use it... * mln/io/off/load.hh: ...here. Aesthetic changes. --- milena/ChangeLog | 10 ++++++++++ milena/mln/geom/complex_geometry.hh | 17 +++++++++++++++-- milena/mln/io/off/load.hh | 30 +++++++++++++++--------------- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4697665..b1288ef 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2011-03-01 Roland Levillain <roland(a)lrde.epita.fr> + + Add a pre-allocation routine to mln::geom::complex_geometry. + + * mln/geom/complex_geometry.hh + (mln::geom::complex_geometry<D, P>::reserve): New. + Use it... + * mln/io/off/load.hh: ...here. + Aesthetic changes. + 2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> Regen Milena's Makefile helpers. diff --git a/milena/mln/geom/complex_geometry.hh b/milena/mln/geom/complex_geometry.hh index f1c604c..7ca99f8 100644 --- a/milena/mln/geom/complex_geometry.hh +++ b/milena/mln/geom/complex_geometry.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -43,7 +44,7 @@ /* FIXME: Also provide functors where the locations are computed using - a function (useful for a complex on a regular grid/support. */ + a function (useful for a complex on a regular grid/support). */ /* FIXME: This class could probably be turned into something more generic, usable for other other purpose, e.g. attaching sites to @@ -106,6 +107,9 @@ namespace mln /// Retrieve the site associated to \a f. site operator()(const mln::topo::face<D>& f) const; + /// Pre-allocate memory. + void reserve(size_t n); + private: mln::util::tracked_ptr< internal::complex_geometry_data > data_; }; @@ -170,6 +174,15 @@ namespace mln return s; } + template <unsigned D, typename P> + inline + void + complex_geometry<D, P>::reserve(size_t n) + { + mln_precondition(data_); + data_->zero_faces_geom.reserve(n); + } + # endif // ! MLN_INCLUDE_ONLY } // end of mln::geom diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index c9c4af7..e66ae28 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -296,17 +297,17 @@ namespace mln /* ``The vertices are listed with x, y, z coordinates, written one per line.'' */ - /* FIXME: We should have a faster way to create a bunch of - 0-faces (vertices). */ - for (unsigned v = 0; v < nvertices; ++v) - c.add_face(); - typedef point3df P; typedef mln_coord_(P) C; typedef geom::complex_geometry<D, P> G; G geom; + geom.reserve(nvertices); for (unsigned v = 0; v < nvertices; ++v) { + // Create a 0-face. + c.add_face(); + + // Record the geometry (point) associated to this vertex. C x, y, z; istr >> &self::eat_comment >> x >> &self::eat_comment >> y @@ -346,10 +347,10 @@ namespace mln topo::n_faces_set<1, D> face_edges_set; face_edges_set.reserve(nface_vertices); - // The first vertex id of the face. + // Remember the first vertex id of the face. unsigned first_vertex_id; istr >> &self::eat_comment >> first_vertex_id; - // The current vertex id initialized with the first id. + // The current vertex id, initialized with the first id. unsigned vertex_id = first_vertex_id; if (first_vertex_id >= nvertices) { @@ -366,7 +367,7 @@ namespace mln mesh/complex. */ unsigned next_vertex_id; /* When V is the id of the last vertex of the face F, - set next_vertex_id to first_vertex_id; otherwise, + set NEXT_VERTEX_ID to FIRST_VERTEX_ID; otherwise, read it from the input. */ if (v == nface_vertices - 1) next_vertex_id = first_vertex_id; @@ -376,7 +377,7 @@ namespace mln if (next_vertex_id >= nvertices) { std::cerr << me << ": `" << filename - << "': invalid vertex id " + << "': invalid vertex id: " << next_vertex_id << std::endl; std::exit(1); } @@ -386,15 +387,14 @@ namespace mln topo::n_face<0, D> next_vertex(c, next_vertex_id); // The current edge. topo::algebraic_n_face<1, D> edge; - // If the edge has been constructed yet, create it; - // otherwise, retrieve its id from the complex. + // If the edge has not been constructed yet, create + // it; otherwise, retrieve its id from the complex. if (!complex_edges[vertex_id][next_vertex_id]) { complex_edges[vertex_id][next_vertex_id] = true; complex_edges[next_vertex_id][vertex_id] = true; edge = - make_algebraic_n_face(c.add_face(vertex - - next_vertex), + make_algebraic_n_face(c.add_face(vertex - next_vertex), true); } else @@ -422,7 +422,7 @@ namespace mln // Site set. domain s(c, geom); - // Values + // Values. values vs; exact(this)->assign(vs, s); -- 1.5.6.5

13 years, 9 months

last-svn-commit-208-ge402de7 Add VTK-format meshes.

by Roland Levillain

* mesh/tetrahedron.vtk, * mesh/pseudo-manifold.vtk: New. * mesh/Makefile.am (dist_mesh_DATA): Add tetrahedron.vtk and pseudo-manifold.vtk. --- milena/ChangeLog | 10 ++ milena/mesh/Makefile.am | 20 ++++- milena/mesh/pseudo-manifold.vtk | 188 +++++++++++++++++++++++++++++++++++++++ milena/mesh/tetrahedron.vtk | 48 ++++++++++ 4 files changed, 262 insertions(+), 4 deletions(-) create mode 100644 milena/mesh/pseudo-manifold.vtk create mode 100644 milena/mesh/tetrahedron.vtk diff --git a/milena/ChangeLog b/milena/ChangeLog index b1288ef..8f604a9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2011-03-01 Roland Levillain <roland(a)lrde.epita.fr> + Add VTK-format meshes. + + * mesh/tetrahedron.vtk, + * mesh/pseudo-manifold.vtk: + New. + * mesh/Makefile.am (dist_mesh_DATA): Add tetrahedron.vtk and + pseudo-manifold.vtk. + +2011-03-01 Roland Levillain <roland(a)lrde.epita.fr> + Add a pre-allocation routine to mln::geom::complex_geometry. * mln/geom/complex_geometry.hh diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index eebfaab..22de64b 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -21,9 +22,9 @@ meshdir = $(pkgdatadir)/meshes dist_mesh_DATA = -## -------- ## -## Meshes. ## -## -------- ## +## ------------ ## +## OFF Meshes. ## +## ------------ ## # The `$(srcdir)/' prefixes are mandatory, to force `$(pinv_curv)' and # `$(max_curv)' to reference files living in the *source* directory, @@ -85,3 +86,14 @@ dist_mesh_DATA += $(max_curv) debug: @echo $(pinv_curv) @echo $(max_curv) + + +## ------------ ## +## VTK Meshes. ## +## ------------ ## + +# A VTK-format version of tetrahedron.off. +dist_mesh_DATA += tetrahedron.vtk + +# The pseudo-manifold of figure 2a in cousty.09.iwcia. +dist_mesh_DATA += pseudo-manifold.vtk diff --git a/milena/mesh/pseudo-manifold.vtk b/milena/mesh/pseudo-manifold.vtk new file mode 100644 index 0000000..81cd6d7 --- /dev/null +++ b/milena/mesh/pseudo-manifold.vtk @@ -0,0 +1,188 @@ +# vtk DataFile Version 2.0 +Generated by Milena 1.0 http://olena.lrde.epita.fr +ASCII +DATASET POLYDATA + +POINTS 18 float +0 1 0 +0 3 0 +0 5 0 +0 7 0 +1.73205081 0 0 +1.73205081 2 0 +1.73205081 4 0 +1.73205081 6 0 +1.73205081 8 0 +3.46410162 1 0 +3.46410162 3 0 +3.46410162 5 0 +3.46410162 7 0 +5.19615242 0 0 +5.19615242 2 0 +5.19615242 4 0 +5.19615242 6 0 +5.19615242 8 0 + +VERTICES 18 36 +1 0 +1 1 +1 2 +1 3 +1 4 +1 5 +1 6 +1 7 +1 8 +1 9 +1 10 +1 11 +1 12 +1 13 +1 14 +1 15 +1 16 +1 17 + +LINES 38 114 +2 0 1 +2 1 2 +2 2 3 +2 0 4 +2 0 5 +2 1 5 +2 1 6 +2 2 6 +2 2 7 +2 3 7 +2 3 8 +2 4 5 +2 5 6 +2 6 7 +2 7 8 +2 4 9 +2 5 9 +2 5 10 +2 6 10 +2 6 11 +2 7 11 +2 7 12 +2 8 12 +2 9 10 +2 10 11 +2 11 12 +2 9 13 +2 9 14 +2 10 14 +2 10 15 +2 11 15 +2 11 16 +2 12 16 +2 12 17 +2 13 14 +2 14 15 +2 15 16 +2 16 17 + +POLYGONS 21 84 +3 0 4 5 +3 0 1 5 +3 1 5 6 +3 1 2 6 +3 2 6 7 +3 2 3 7 +3 3 7 8 +3 4 5 9 +3 5 9 10 +3 5 6 10 +3 6 10 11 +3 6 7 11 +3 7 11 12 +3 7 8 12 +3 9 13 14 +3 9 10 14 +3 10 14 15 +3 10 11 15 +3 11 15 16 +3 11 12 16 +3 12 16 17 + +CELL_DATA 77 +SCALARS values bit +LOOKUP_TABLE default +1 +1 +1 +1 +0 +1 +1 +1 +0 +1 +1 +1 +1 +0 +1 +1 +1 +0 +1 +0 +1 +0 +1 +1 +0 +1 +1 +1 +0 +0 +0 +1 +0 +0 +1 +1 +0 +1 +1 +1 +0 +0 +1 +1 +0 +1 +1 +0 +1 +1 +1 +0 +0 +0 +1 +0 +0 +1 +0 +0 +0 +1 +0 +0 +0 +0 +0 +1 +1 +0 +0 +0 +0 +0 +1 +1 +0 diff --git a/milena/mesh/tetrahedron.vtk b/milena/mesh/tetrahedron.vtk new file mode 100644 index 0000000..f6226a1 --- /dev/null +++ b/milena/mesh/tetrahedron.vtk @@ -0,0 +1,48 @@ +# vtk DataFile Version 2.0 +Generated by Milena 1.0 http://olena.lrde.epita.fr +ASCII +DATASET POLYDATA + +POINTS 4 float +0 0 2 +1.63299 -0.942809 -0.666667 +0 1.88562 -0.666667 +-1.63299 -0.942809 -0.666667 + +VERTICES 4 8 +1 0 +1 1 +1 2 +1 3 + +LINES 6 18 +2 1 0 +2 0 3 +2 3 1 +2 2 0 +2 1 2 +2 2 3 + +POLYGONS 4 16 +3 1 0 3 +3 2 0 1 +3 3 0 2 +3 3 2 1 + +CELL_DATA 14 +SCALARS values bit +LOOKUP_TABLE default +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 -- 1.5.6.5

13 years, 9 months

last-svn-commit-209-g6629f93 Add preliminary VTK input for binary images.

by Roland Levillain

* mln/io/vtk/load.hh: New file. Include it... * mln/io/vtk/all.hh: ...here. * tests/io/vtk/load_bin.cc, * tests/io/vtk/load_save_bin.cc: New. * tests/io/vtk/Makefile.am (check_PROGRAMS): Add load_bin and load_save_bin. (load_bin_SOURCES, load_save_bin_SOURCES): New. (MOSTLYCLEANFILES): Add load_save_bin-out.vtk. --- milena/ChangeLog | 15 + milena/mln/io/vtk/all.hh | 3 +- milena/mln/io/vtk/load.hh | 615 +++++++++++++++++++++++++ milena/tests/io/vtk/Makefile.am | 7 +- milena/tests/io/{off => vtk}/load_bin.cc | 12 +- milena/tests/io/{off => vtk}/load_save_bin.cc | 15 +- 6 files changed, 654 insertions(+), 13 deletions(-) create mode 100644 milena/mln/io/vtk/load.hh copy milena/tests/io/{off => vtk}/load_bin.cc (87%) copy milena/tests/io/{off => vtk}/load_save_bin.cc (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8f604a9..690a83b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2011-03-01 Roland Levillain <roland(a)lrde.epita.fr> + Add preliminary VTK input for binary images. + + * mln/io/vtk/load.hh: New file. + Include it... + * mln/io/vtk/all.hh: ...here. + * tests/io/vtk/load_bin.cc, + * tests/io/vtk/load_save_bin.cc: + New. + * tests/io/vtk/Makefile.am (check_PROGRAMS): Add load_bin and + load_save_bin. + (load_bin_SOURCES, load_save_bin_SOURCES): New. + (MOSTLYCLEANFILES): Add load_save_bin-out.vtk. + +2011-03-01 Roland Levillain <roland(a)lrde.epita.fr> + Add VTK-format meshes. * mesh/tetrahedron.vtk, diff --git a/milena/mln/io/vtk/all.hh b/milena/mln/io/vtk/all.hh index 6ff98ce..74d37c8 100644 --- a/milena/mln/io/vtk/all.hh +++ b/milena/mln/io/vtk/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -41,6 +41,7 @@ namespace mln } +# include <mln/io/vtk/load.hh> # include <mln/io/vtk/save.hh> #endif // ! MLN_IO_VTK_ALL_HH diff --git a/milena/mln/io/vtk/load.hh b/milena/mln/io/vtk/load.hh new file mode 100644 index 0000000..ec078cb --- /dev/null +++ b/milena/mln/io/vtk/load.hh @@ -0,0 +1,615 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_IO_VTK_LOAD_HH +# define MLN_IO_VTK_LOAD_HH + +/// \file +/// Input saving function for VTK files. +/// +/// \see http://www.vtk.org/VTK/img/file-formats.pdf +/// \see http://dunne.uni-hd.de/VisuSimple/documents/vtkfileformat.html +/// +/// The routines of this file only supported a subset of the file +/// format(s) defined in the VTK documentation. + +# include <cstdlib> +# include <iostream> +# include <fstream> +# include <sstream> +# include <string> + +# include <mln/core/alias/complex_image.hh> + + +namespace mln +{ + + namespace io + { + + namespace vtk + { + + /** \brief Load a (binary) VTK image into a complex image. + + \param[in] ima A reference to the image to construct. + \param[in] filename The name of the file to load. + */ + void load(bin_2complex_image3df& ima, const std::string& filename); + + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: To be put elsewehre (factored), or encapsulated in a + // class containing the `load' routine as well. + namespace internal + { + + inline + void + error(const std::string& caller, const std::string& filename, + const std::string& message) + { + std::cerr << caller << ": `" << filename << "': " + << message << std::endl; + std::exit(1); + } + + inline + void + accept(const std::string& token, const std::string& expected, + const std::string& caller, const std::string& filename, + const std::string& message) + { + if (token != expected) + error(caller, filename, message); + } + + // Likewise, with default message. + inline + void + accept(const std::string& token, const std::string& expected, + const std::string& caller, const std::string& filename) + { + accept(token, expected, caller, filename, + std::string("parse error (`") + expected + "' expected, " + + "got `" + token + "')."); + } + + // FIXME: To be moved elsewhere. + /// Create a string from X using operator<<. + template <typename T> + std::string + str(const T& x) + { + std::stringstream s; + s << x; + return s.str(); + } + + } // end of namespace mln::io::vtk::internal + + + inline + void + load(bin_2complex_image3df& ima, const std::string& filename) + { + typedef bin_2complex_image3df I; + + const std::string me = "mln::io::off::load"; + + std::ifstream istr(filename.c_str()); + if (!istr) + { + std::cerr << me << ": `" << filename << "' not found." + << std::endl; + /* FIXME: Too violent. We should allow the use of + exceptions, at least to have Milena's code behave + correctly in interpreted environments (std::exit() or + std::abort() causes the termination of a Python + interpreter, for instance!). */ + std::exit(1); + } + + /*---------. + | Header. | + `---------*/ + + /* ``The legacy VTK file formats consist of five basic + parts.'' */ + + /* ``1. The first part is the file version and + identifier. This part contains the single line: + + # vtk DataFile Version x.x. + + This line must be exactly as shown with the + exception of the version number x.x, which will vary + with different releases of VTK. (Note: the current + version number is 3.0. Version 1.0 and 2.0 files are + compatible with version 3.0 files.)'' */ + std::string version; + std::getline(istr, version); + // FIXME: Check the format of VERSION. + + /* ``2. The second part is the header. The header consists + of a character string terminated by end-of-line + character `\n'. The header is 256 characters + maximum. The header can be used to describe the data + and include any other pertinent information.'' */ + std::string header; + std::getline(istr, header); + + /* ``3. The next part is the file format. The file format + describes the type of file, either ASCII or + binary. On this line the single word ASCII or BINARY + must appear.'' */ + std::string format; + istr >> format; + if (format == "BINARY") + internal::error(me, filename, + "`BINARY' VTK format is not supported " + "(only `ASCII' is supported yet)."); + else if (format != "ASCII") + internal::error(me, filename, + std::string("invalid file format: `") + + format + "'."); + + /*-------. + | Data. | + `-------*/ + + /* ``4. The fourth part is the dataset structure. The + geometry part describes the geometry and topology of + the dataset. This part begins with a line containing + the keyword DATASET followed by a keyword describing + the type of dataset. Then, depending upon the type + of dataset, other keyword/data combinations define + the actual data.'' + + [...] + + Dataset Format. The Visualization Toolkit supports + five different dataset formats: structured points, + structured grid, rectilinear grid, unstructured + grid, and polygonal data.'' */ + + std::string dataset_keyword, dataset_type; + istr >> dataset_keyword >> dataset_type; + internal::accept(dataset_keyword, "DATASET", me, filename); + internal::accept(dataset_type, "POLYDATA", me, filename, + "unsupported dataset structure " + "(only `POLYDATA' is supported yet)."); + + // --------- // + // Complex. // + // --------- // + + const unsigned D = 2; + topo::complex<D> c; + + /* ``* Polygonal Data + The polygonal dataset consists of arbitrary + combinations of surface graphics primitives + vertices (and polyvertices), lines (and + polylines), polygons (of various types), and + triangle strips. Polygonal data is defined by + the POINTS, VERTICES, LINES, POLYGONS, or + TRIANGLE_STRIPS sections. The POINTS definition + is the same as we saw for structured grid + datasets.'' */ + + // ----------------------------------------- // + // Vertices and geometry (point locations). // + // ----------------------------------------- // + + std::string points_keyword; + unsigned npoints; + std::string points_datatype; + istr >> points_keyword >> npoints >> points_datatype; + internal::accept(points_keyword, "POINTS", me, filename); + internal::accept(points_datatype, "float", me, filename, + "unsupported points data type " + "(only `float' is supported yet)."); + + typedef point3df P; + typedef mln_coord_(P) C; + typedef mln_geom_(I) G; + G geom; + geom.reserve(npoints); + for (unsigned i = 0; i < npoints; ++i) + { + // Create a 0-face. + c.add_face(); + + // Record the geometry (point) associated to this vertex. + C x, y, z; + istr >> x >> y >> z; + geom.add_location(P(x, y, z)); + } + + /* ``The VERTICES, LINES, POLYGONS, or + TRIANGLE_STRIPS keywords define the polygonal + dataset topology. Each of these keywords + requires two parameters: the number of cells `n' + and the size of the cell list `size'. The cell + list size is the total number of integer values + required to represent the list (i.e., sum of + `numPoints' and connectivity indices over each + cell). None of the keywords VERTICES, LINES, + POLYGONS, or TRIANGLE_STRIPS is required.'' */ + + // ---------- // + // Vertices. // + // ---------- // + + /* FIXME: Add another constraint: a bijection between + VERTICES and POINTS shall exist. Update the following + comment accordingly. */ + + /* The VTK file format contains both a POINTS and a VERTICES + section. Despite its name, the former is used to create + the set of vertices of the complex (because POINTS are + later used to form line (edges) and polygons. The latter + (VERTICES) is used to attach values (data) to 0-faces, + and act as an indirection toward POINTS. The fact is, + most VTK file we use have a VERTICES section where the + N-th line (starting at 0) contains + + 1 N + + which makes the VERTICES section kind of useless. + However, we have to parse it and take it into account for + the sake of the file format. */ + + std::string vertices_keyword; + unsigned nvertices, vertices_size; + istr >> vertices_keyword >> nvertices >> vertices_size; + internal::accept(vertices_keyword, "VERTICES", me, filename); + + /* Each vertex requires two numbers: the cardinal of + its ends (which is always 1) and the indices of the + point among the POINTS section. Hence the total + number of values in the VERTEX section is + nvertices * 2. */ + // FIXME: This test is not really robust: we should involve + // the VERTICES_SIZE value in the parsing process. + if (vertices_size != nvertices * 2) + internal::error(me, filename, "ill-formed `VERTICES' section."); + + // Vertices built on points. + std::vector<unsigned> vertices; + vertices.reserve(npoints); + for (unsigned i = 0; i < nvertices; ++i) + { + unsigned numpoints, p; + istr >> numpoints >> p; + if (numpoints != 1) + internal::error(me, filename, "ill-formed vertex item."); + if (p > npoints) + internal::error(me, filename, + "point id out of bounds in vertex item."); + vertices.push_back(p); + } + + // ------- // + // Edges. // + // ------- // + + std::string lines_keyword; + unsigned nedges, edges_size; + istr >> lines_keyword >> nedges >> edges_size; + internal::accept(lines_keyword, "LINES", me, filename); + + /* Each edge requires three numbers: the cardinal of + its ends (which is always 2) and the indices of + these ends among the POINTS section. Hence the + total number of values in the LINES section is + nedges * 3. */ + // FIXME: This test is not really robust: we should involve + // the EDGES_SIZE value in the parsing process. + if (edges_size != nedges * 3) + internal::error(me, filename, "ill-formed `LINES' section."); + + // An adjacenty matrix recording the edges seen so far. + typedef std::vector< std::vector<bool> > complex_edges_t; + complex_edges_t complex_edges (npoints, + std::vector<bool>(npoints, false)); + + // Populate the complex and the adjacency matrix + for (unsigned i = 0; i < nedges; ++i) + { + // Create a 1-face. + unsigned numpoints, p1, p2; + istr >> numpoints >> p1 >> p2; + if (numpoints != 2) + internal::error(me, filename, "ill-formed line item."); + if (p1 > npoints || p2 > npoints) + internal::error(me, filename, + "point id out of bounds in line item."); + topo::n_face<0, D> v1(c, p1); + topo::n_face<0, D> v2(c, p2); + c.add_face(v1 - v2); + // Tag this edged (and its opposite) in the adjacency matrix. + complex_edges[p1][p2] = true; + complex_edges[p2][p1] = true; + } + + // ---------- // + // Polygons. // + // ---------- // + + std::string polygons_keyword; + unsigned npolygons, polygons_size; + istr >> polygons_keyword >> npolygons >> polygons_size; + internal::accept(polygons_keyword, "POLYGONS", me, filename); + + // Read polygon values. + unsigned npolygons_values = 0; + + for (unsigned i = 0; i < npolygons; ++i) + { + unsigned numpoints; + istr >> numpoints; + ++npolygons_values; + if (numpoints <= 2) + { + internal::error(me, filename, + std::string("ill-formed face (having ") + + internal::str(numpoints) + + (numpoints < 2 ? "vertex" : "vertices") + + ")."); + } + + /* FIXME: This part (computing the set of edges on which + a polygon is built) is also shared by + mln::io::off::load; we can probably factor it. */ + + // The edges of the face. + topo::n_faces_set<1, D> face_edges_set; + face_edges_set.reserve(numpoints); + + // Remember the first point id of the face. + unsigned first_point_id; + istr >> first_point_id; + ++npolygons_values; + // The current point id, initialized with the first id. + unsigned point_id = first_point_id; + if (point_id >= npoints) + internal::error(me, filename, + std::string("invalid point id: `") + + internal::str(point_id) + "'."); + for (unsigned p = 0; p < numpoints; ++p) + { + /* The next point id. The pair (point_id, + next_point_id) is an edge of the + mesh/complex. */ + unsigned next_point_id; + /* When P is the id of the last point of the face, + set NEXT_POINT_ID to FIRST_VERTEX_ID; otherwise, + read it from the input. */ + if (p == numpoints - 1) + next_point_id = first_point_id; + else + { + istr >> next_point_id; + ++npolygons_values; + if (next_point_id >= npoints) + internal::error(me, filename, + std::string("invalid point id: `") + // In-line ``itoa'' of NEXT_POINT_ID. + + internal::str(next_point_id) + "'."); + } + // The ends of the current edge. + topo::n_face<0, D> vertex(c, point_id); + topo::n_face<0, D> next_vertex(c, next_point_id); + // The current edge. + topo::algebraic_n_face<1, D> edge; + /* The edge (POINT_ID, NEXT_POINT_ID) (or its + opposite (NEXT_POINT_ID, POINT_ID) must have been + inserted previously. In other words, the sides + of POLYGON items must belong to the list of + LINES. */ + if (!complex_edges[point_id][next_point_id]) + internal::error(me, filename, + "ill-formed polygon, having a side " + "(edge) not part of the list of LINES."); + edge = topo::edge(vertex, next_vertex); + mln_assertion(edge.is_valid()); + // Add this edge a side of the polygon. + face_edges_set += edge; + // Next vertex. + point_id = next_point_id; + } + + // Add face. + c.add_face(face_edges_set); + } + + // FIXME: This test is not really robust: we should involve + // the POLYGONS_SIZE value in the parsing process. + if (polygons_size != npolygons_values) + internal::error(me, filename, "ill-formed `LINES' section."); + + // -------------------- // + // Dataset attributes. // + // -------------------- // + + /* ``5. The final part describes the dataset attributes. + This part begins with the keywords POINT_DATA or + CELL_DATA, followed by an integer number specifying + the number of points or cells, respectively. (It + doesn't matter whether POINT_DATA or CELL_DATA comes + first.) Other keyword/data combinations then define + the actual dataset attribute values (i.e., scalars, + vectors, tensors, normals, texture coordinates, or + field data).'' */ + std::string dataset_kind; + istr >> dataset_kind; + if (dataset_kind == "POINT_DATA") + internal::error(me, filename, + "`POINT_DATA' datasets are not supported " + "(only `CELL_DATA' datasets are supported yet)."); + else if (dataset_kind != "CELL_DATA") + internal::error(me, filename, + std::string("invalid dataset kind: `") + + dataset_kind + "'."); + unsigned nfaces = nvertices + nedges + npolygons; + unsigned ncell_data; + istr >> ncell_data; + if (ncell_data != nfaces) + internal::error(me, filename, + std::string("wrong number of dataset attributes ") + + "(expected " + internal::str(nfaces) + + ", got " + internal::str(ncell_data) + ")."); + + /* ``Dataset Attribute Format. The Visualization Toolkit + supports the following dataset attributes: scalars + (one to four components), vectors, normals, + texture coordinates (1D, 2D, and 3D), 3 x 3 + tensors, and field data. In addition, a lookup + table using the RGBA color specification, + associated with the scalar data, can be defined as + well. Dataset attributes are supported for both + points and cells. + Each type of attribute data has a `dataName' + associated with it. This is a character string + (without embedded whitespace) used to identify a + particular data. The `dataName' is used by the VTK + readers to extract data. As a result, more than + one attribute data of the same type can be + included in a file. For example, two different + scalar fields defined on the dataset points, + pressure and temperature, can be contained in the + same file. (If the appropriate dataName is not + specified in the VTK reader, then the first data + of that type is extracted from the file.) + + * Scalars + Scalar definition includes specification of a + lookup table. The definition of a lookup table + is optional. + + [...] + + SCALARS dataName dataType numComp + LOOKUP_TABLE tableName + s0 + s1 + ... + sn-1'' + + Note: values accepted by Paraview 3.8 for `dataType' are: + "bit", "char", "unsigned_char", "short", "unsigned_short", + "vtkidtype", "int", "unsigned_int", "long", + "unsigned_long", "vtktypeint64", "vtktypeuint64", "float", + "double", "string", "utf8_string" and "variant". */ + + std::string scalars_keyword, data_name, data_type; + istr >> scalars_keyword >> data_name >> data_type; + internal::accept(scalars_keyword, "SCALARS", me, filename); + // FIXME: As in the rest of this routine's code, we only + // handle the case of binary values (for the moment). + if (data_type != "bit") + internal::error(me, filename, + std::string("unsupported data (value) type : `") + + data_type + "' (only `bit' is supported yet)."); + + std::string lookup_table_keyword, lookup_table_name; + istr >> lookup_table_keyword >> lookup_table_name; + internal::accept(lookup_table_keyword, "LOOKUP_TABLE", me, filename); + + // Values. + typedef mln_value_(I) V; + typedef metal::vec<D + 1, std::vector<V> > values; + values vs; + + // Populate values associated to 0-faces. + /* FIXME: The default value used (here 0) depends on the + images's value type. */ + vs[0].resize(npoints, 0); + // Iterate on VERTICES (not ``points''). We cannot copy + // VERTICES into VS[0] as-is, since VS[0] corresponds to + // points. + for (std::vector<unsigned>::const_iterator v = vertices.begin(); + v != vertices.end(); ++ v) + { + V value; + istr >> value; + // The point id on which the vertex V is built. + unsigned p = *v; + vs[0][p] = value; + } + + // Populate values associated to 1-faces. + for(unsigned e = 0; e < nedges; ++e) + { + V value; + istr >> value; + vs[1].push_back(value); + } + + // Populate values associated to 2-faces. + for(unsigned f = 0; f < npolygons; ++f) + { + V value; + istr >> value; + vs[2].push_back(value); + } + + /*--------. + | Image. | + `--------*/ + + // Site set. + typedef mln_domain_(I) domain; + domain s(c, geom); + + // Image. + ima.init_(s, vs); + + /*--------------. + | End of file. | + `--------------*/ + + // FIXME: Eat comments and whitespace, and check the end of + // the file has been reached. + // ... + istr.close(); + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::io::vtk + + } // end of namespace mln::io + +} // end of namespace mln + + +#endif // ! MLN_IO_VTK_LOAD_HH diff --git a/milena/tests/io/vtk/Makefile.am b/milena/tests/io/vtk/Makefile.am index 548f1b5..9554a4b 100644 --- a/milena/tests/io/vtk/Makefile.am +++ b/milena/tests/io/vtk/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,13 +16,16 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = save +check_PROGRAMS = load_bin load_save_bin save +load_bin_SOURCES = load_bin.cc +load_save_bin_SOURCES = load_save_bin.cc save_SOURCES = save.cc TESTS = $(check_PROGRAMS) MOSTLYCLEANFILES = \ + load_save_bin-out.vtk \ save-tetrahedron-bool.vtk \ save-tetrahedron-int_u8.vtk \ save-tetrahedron-unsigned.vtk \ diff --git a/milena/tests/io/off/load_bin.cc b/milena/tests/io/vtk/load_bin.cc similarity index 87% copy from milena/tests/io/off/load_bin.cc copy to milena/tests/io/vtk/load_bin.cc index 3d35a44..a4ddf10 100644 --- a/milena/tests/io/off/load_bin.cc +++ b/milena/tests/io/vtk/load_bin.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,22 +23,26 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// \brief Exercise mln::io::vtk::load on binary mesh images. + #include <algorithm> #include <iterator> #include <iostream> -#include <mln/io/off/load.hh> +#include <mln/io/vtk/load.hh> #include "tests/data.hh" -int main() +int +main() { using namespace mln; typedef bin_2complex_image3df ima_t; ima_t ima; - io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); + io::vtk::load(ima, MLN_MESH_DIR "/tetrahedron.vtk"); std::cout << ima.domain().cplx() << std::endl; diff --git a/milena/tests/io/off/load_save_bin.cc b/milena/tests/io/vtk/load_save_bin.cc similarity index 80% copy from milena/tests/io/off/load_save_bin.cc copy to milena/tests/io/vtk/load_save_bin.cc index 3287910..a4fc777 100644 --- a/milena/tests/io/off/load_save_bin.cc +++ b/milena/tests/io/vtk/load_save_bin.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,12 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// \brief Exercise mln::io::vtk::load and mln::io::vtk::save on +/// binary mesh images. + #include <algorithm> #include <iterator> #include <iostream> -#include <mln/io/off/load.hh> -#include <mln/io/off/save.hh> +#include <mln/io/vtk/load.hh> +#include <mln/io/vtk/save.hh> #include "tests/data.hh" @@ -40,6 +43,6 @@ int main() typedef bin_2complex_image3df ima_t; ima_t ima; - io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); - io::off::save(ima, "load_save_bin-out.off"); + io::vtk::load(ima, MLN_MESH_DIR "/tetrahedron.vtk"); + io::vtk::save(ima, "load_save_bin-out.vtk"); } -- 1.5.6.5

13 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches