- Olena-patches

r3370: Call the n_max() function..
by Fabien Freling 13 Feb '09

13 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-13 Fabien Freling <fabien.freling(a)lrde.epita.fr> Call the n_max() function.. * fabien/igr/igr.cc: Call the n_max() function instead of doing the computation. --- igr.cc | 61 ++++--------------------------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-) Index: trunk/milena/sandbox/fabien/igr/igr.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/igr.cc (revision 3369) +++ trunk/milena/sandbox/fabien/igr/igr.cc (revision 3370) @@ -53,6 +53,7 @@ #include <mln/labeling/blobs.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/fill_holes.hh> +#include <mln/labeling/n_max.hh> #include <mln/level/compare.hh> #include <mln/level/transform.hh> @@ -119,67 +120,13 @@ initialize(big_second, input); data::fill(big_second, false); -// mln_ch_value(I, bool) in_bool; -// initialize(in_bool, input); -// data::fill(in_bool, false); - - unsigned big_third_count = 0; - unsigned big_third_lbl = 0; - unsigned big_second_count = 0; - unsigned big_second_lbl = 0; - unsigned big_first_count = 0; - unsigned big_first_lbl = 0; - for (int i = 0; i < a.nelements(); ++i) - { - if (a[i] > big_third_count) - { - big_third_count = a[i]; - big_third_lbl = i; - } - if (big_third_count > big_second_count) - { - int swap = big_second_count; - int swap_lbl = big_second_lbl; - big_second_count = big_third_count; - big_second_lbl = big_third_lbl; - big_third_count = swap; - big_third_lbl = swap_lbl; - } - if (big_second_count > big_first_count) - { - int swap = big_first_count; - int swap_lbl = big_first_lbl; - big_first_count = big_second_count; - big_first_lbl = big_second_lbl; - big_second_count = swap; - big_second_lbl = swap_lbl; - } - } - data::fill((big_second | (pw::value(labels) == big_second_lbl)).rw(), true); - mln_VAR(big_third, threshold | pw::value(labels) == big_third_lbl); -// data::fill((in_bool | (pw::value(labels) == big_second_lbl || pw::value(labels) == big_third_lbl)).rw(), true); + util::array<L> arr_big = labeling::n_max<L>(a, 3); + data::fill((big_second | (pw::value(labels) == arr_big[2])).rw(), true); + mln_VAR(big_third, threshold | pw::value(labels) == arr_big[3]); // Fill holes. big_second = labeling::fill_holes(big_second, nbh, nlabels); -// box<mln_site(I)> h_box = geom::bbox((in_bool | pw::value(labels) == big_second_lbl).domain()); - //h_box.enlarge(1); - - //mln_ch_value(I, L) h_lbls = labeling::background(big_second /*in_bool | h_box*/, nbh, nlabels); - //util::array<unsigned> arr_holes = labeling::compute(a_, big_second /*in_bool | h_box*/, h_lbls, nlabels); - //int bg_count = 0; - //int bg_lbl = 0; - //for (int i = 0; i < arr_holes.nelements(); ++i) - //{ - // if (arr_holes[i] > bg_count) - // { - // bg_count = a[i]; - // bg_lbl = i; - // } - //} - //data::fill((/*(*/big_second /*in_bool | h_box).rw()*/ | pw::value(h_lbls) != bg_lbl).rw(), true); - - /*return level::transform(h_lbls, L_to_int_u8<label_16>());*/ // Gradient.

1 0

3369: Add more doc to ICP.
by Guillaume Lazzara 13 Feb '09

13 Feb '09

* mln/registration/icp2.hh: add more comments and rename registraction::icp# as registration::registration#. --- milena/ChangeLog | 7 ++ milena/mln/registration/icp2.hh | 151 +++++++++++++++++++++++++++++++++------ 2 files changed, 136 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 78fb7b6..8956419 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more doc to ICP. + + * mln/registration/icp2.hh: add more comments and rename + registraction::icp# as registration::registration#. + 2009-02-13 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add the morphological sum attribute. diff --git a/milena/mln/registration/icp2.hh b/milena/mln/registration/icp2.hh index 1a6f331..916f8c0 100644 --- a/milena/mln/registration/icp2.hh +++ b/milena/mln/registration/icp2.hh @@ -79,8 +79,9 @@ namespace mln namespace registration { - // std::string method = "compute_on_subsets"; - std::string method = "compute_on_subset_and_p"; + + //FIXME: used for debug purpose. Should be removed later. + using namespace fun::x2x; /*! Register point in \p c using a function of closest points @@ -105,7 +106,6 @@ namespace mln * */ template <typename P, typename F> -// composed< translation<P::dim,float>,rotation<P::dim,float> > std::pair<algebra::quat,mln_vec(P)> icp(const p_array& P_, const p_array& X, @@ -120,6 +120,39 @@ namespace mln const F& closest_point); + //FIXME: move to registration.hh + /// Call ICP once and return the resulting transformation. + template <typename P, typename F> + inline + composed< translation<P::dim,float>,rotation<P::dim,float> > + registration1(const p_array& P_, + const p_array& X); + + //FIXME: move to registration.hh + /// Call ICP 10 times. + /// Do the first call to ICP with all sites then work on a subset of + /// which size is decreasing. + /// For each call, sites part of the subset which are too far or too + /// close are removed. + /// Removed sites are *NOT* reused later in the subset. + template <typename P> + inline + composed< translation<P::dim,float>,rotation<P::dim,float> > + registration2(const p_array& P_, + const p_array& X); + + //FIXME: move to registration.hh + /// Call ICP 10 times. + /// Do the first call to ICP with all sites then work on a subset. + /// For each call, a distance criterion is computed on a subset. + /// A new subset is computed from the whole set of points according + /// to this distance. It will be used in the next call. + /// Sites which have been removed can be reintegrated. + template <typename P> + inline + composed< translation<P::dim,float>,rotation<P::dim,float> > + registration3(const p_array& P_, + const p_array& X); # ifndef MLN_INCLUDE_ONLY @@ -156,7 +189,7 @@ namespace mln cp_ima_ = f.cp_ima; -//#ifndef NDEBUG +#ifndef NDEBUG mln_ch_value(I, bool) debug2(box); data::fill(debug2, false); mln_ch_value(I, value::rgb8) debug(box); @@ -178,7 +211,7 @@ namespace mln io::pbm::save(slice(debug2,0), "debug2-b.ppm"); io::ppm::save(slice(debug,0), "debug.ppm"); std::cout << "map saved" << std::endl; -//#endif +#endif } mln_site(I) operator()(const mln_site(I)& p) const @@ -309,15 +342,15 @@ namespace mln } } +#ifndef NDEBUG std::ostringstream ss1; ss1 << "histo_" << prefix << r << ".dat"; -// debug::histo_plot(h, ss1.str()); std::cout << h << std::endl; std::ostringstream ss2; ss2 << "out_" << prefix << r << ".ppm"; io::ppm::save(mln::slice(out,0), ss2.str()); - +#endif std::cout << "Points removed with the whole set and current d_min/d_max: " << removed << std::endl; } @@ -352,7 +385,6 @@ namespace mln std::cout << "Standard deviation = " << sd << std::endl; std::ostringstream ss1; ss1 << "histo_" << r << ".dat"; - debug::histo_plot(h, ss1.str()); std::cout << h << std::endl; std::cout << "d thresholds = " << d_min << ' ' << d_max << std::endl; } @@ -542,7 +574,6 @@ namespace mln /// Base version of the ICP algorithm. It is called in other variants. template <typename P, typename F> inline -// composed< translation<P::dim,float>,rotation<P::dim,float> > std::pair<algebra::quat,mln_vec(P)> icp(const p_array& P_, const p_array& X, @@ -648,17 +679,19 @@ namespace mln - /// Single call to ICP with all sites. template <typename P, typename F> inline composed< translation<P::dim,float>,rotation<P::dim,float> > - icp(const p_array& P_, - const p_array& X, - const F& closest_point) + registration1(const p_array& P_, + const p_array& X) { + trace::entering("mln::registration::registration1"); + util::timer t; t.start(); + registration::closest_point_with_map closest_point(X); + std::pair<algebra::quat,mln_vec(P)> pair = icp(P_, X, closest_point, algebra::quat(1,0,0,0), literal::zero); @@ -670,20 +703,23 @@ namespace mln trans_t tqT(pair.second); composed<trans_t, rot_t> result(tqT, tqR); + trace::exiting("mln::registration::registration1"); + return result; } - /// Shuffle sites in P_. - /// Do the first run with all sites. - /// For each run, remove sites which are too far or too close. + template <typename P> inline composed< translation<P::dim,float>,rotation<P::dim,float> > - registration(const p_array& P_, - const p_array& X) + registration2(const p_array& P_, + const p_array& X) { + trace::entering("mln::registration::registration2"); + + std::string method = "compute_on_subsets"; + registration::closest_point_with_map closest_point(X); -// registration::closest_point_basic<point3d> closest_point(X); util::timer t; t.start(); @@ -717,12 +753,79 @@ namespace mln closest_point, pair, X, removed_set, r, d_min, d_max, method); -// P_bak = remove_too_far_sites(out, P_, -// closest_point, pair, X, removed_set, -// r, d_min, d_max, method); +#ifndef NDEBUG + display_sites_used_in_icp(out, P_bak, P_, X, r, method, pair, "schanges", literal::green); +#endif + + ++r; + + std::cout << "==== End of run" << std::endl; + } while (r < 10); + std::cout << "icp = " << t << std::endl; + +#ifndef NDEBUG + draw_last_run(box, P_bak, removed_set, X, pair.first, pair.second); +#endif + + typedef rotation<3u,float> rot_t; + rot_t tqR(pair.first); + typedef translation<3u,float> trans_t; + trans_t tqT(pair.second); + composed<trans_t,rot_t> result(tqT, tqR); + + trace::exiting("mln::registration::registration2"); + + return result; + } + + + template <typename P> + inline + composed< translation<P::dim,float>,rotation<P::dim,float> > + registration3(const p_array& P_, + const p_array& X) + { + trace::entering("mln::registration::registration3"); + + registration::closest_point_with_map closest_point(X); + + std::string method = "compute_on_subset_and_p"; + + util::timer t; + t.start(); + + // P_bak is shuffled. + p_array P_bak = P_; + + unsigned r = 0; + std::pair<algebra::quat,mln_vec(P)> pair; + pair.first = algebra::quat(1,0,0,0); + pair.second = literal::zero; + box3d box = geom::bbox(X); + box.enlarge(1, 60); + box.enlarge(2, 60); + image3d<value::rgb8> out(box); + p_array removed_set; + + do + { + std::cout << std::endl << std::endl << "==== New run - " << r << std::endl; + pair = icp(P_bak, X, closest_point, + pair.first, + pair.second); + display_sites_used_in_icp(out, P_bak, P_, X, r, method, pair, "final", literal::blue); + int d_min, d_max; + compute_distance_criteria(P_bak, closest_point, pair, r, d_min, d_max); + + P_bak = remove_too_far_sites(out, P_, + closest_point, pair, X, removed_set, + r, d_min, d_max, method); + +#ifndef NDEBUG display_sites_used_in_icp(out, P_bak, P_, X, r, method, pair, "schanges", literal::green); +#endif ++r; @@ -730,7 +833,9 @@ namespace mln } while (r < 10); std::cout << "icp = " << t << std::endl; +#ifndef NDEBUG draw_last_run(box, P_bak, removed_set, X, pair.first, pair.second); +#endif typedef rotation<3u,float> rot_t; rot_t tqR(pair.first); @@ -738,6 +843,8 @@ namespace mln trans_t tqT(pair.second); composed<trans_t,rot_t> result(tqT, tqR); + trace::exiting("mln::registration::registration3"); + return result; } -- 1.5.6.5

1 0

3368: Add the morphological sum attribute.
by Thierry Geraud 13 Feb '09

13 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add the morphological sum attribute. * mln/morpho/attribute/sum.hh: New. * mln/morpho/attribute/volume.hh (area): New . * mln/morpho/attribute/card.hh: Layout. (take_as_init): New overload for util::pix. * mln/morpho/attribute/all.hh: Update. * tests/morpho/attribute/sum.cc: New. * tests/morpho/attribute/volume.cc: New. * tests/morpho/attribute/Makefile.am: Update. mln/morpho/attribute/all.hh | 2 mln/morpho/attribute/card.hh | 30 +++++++--- mln/morpho/attribute/sum.hh | 111 +++++++++++++++++++------------------ mln/morpho/attribute/volume.hh | 11 +++ tests/morpho/attribute/Makefile.am | 6 +- tests/morpho/attribute/sum.cc | 53 +++++++++++++++++ tests/morpho/attribute/volume.cc | 48 ++++++++++++++++ 7 files changed, 198 insertions(+), 63 deletions(-) Index: mln/morpho/attribute/sum.hh --- mln/morpho/attribute/sum.hh (revision 3367) +++ mln/morpho/attribute/sum.hh (working copy) @@ -25,16 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_ATTRIBUTE_CARD_HH -# define MLN_MORPHO_ATTRIBUTE_CARD_HH +#ifndef MLN_MORPHO_ATTRIBUTE_SUM_HH +# define MLN_MORPHO_ATTRIBUTE_SUM_HH -/// \file mln/morpho/attribute/card.hh +/// \file mln/morpho/attribute/sum.hh /// -/// Define an accumulator that computes the cardinality of a -/// component. +/// Define an accumulator that computes the sum of component values. # include <mln/accu/internal/base.hh> +# include <mln/trait/value_.hh> // For mln_sum. +# include <mln/value/builtin/all.hh> // In the case of summing builtin values. +# include <mln/literal/zero.hh> // For initialization. + namespace mln { @@ -44,7 +47,7 @@ namespace morpho { namespace attribute { - template <typename I> class card; + template <typename I, typename S> class sum; } } @@ -54,13 +57,13 @@ namespace trait { - template <typename I> - struct accumulator_< morpho::attribute::card > + template <typename I, typename S> + struct accumulator_< morpho::attribute::sum<I,S> > { typedef accumulator::has_untake::no has_untake; typedef accumulator::has_set_value::no has_set_value; typedef accumulator::has_stop::no has_stop; - typedef accumulator::when_pix::use_none when_pix; + typedef accumulator::when_pix::use_v when_pix; }; } // end of namespace mln::trait @@ -72,116 +75,118 @@ namespace attribute { - /// Cardinality accumulator class. + /// Suminality accumulator class. - template <typename I> - class card : public mln::accu::internal::base< unsigned, card > + template <typename I, typename S = mln_sum(mln_value(I))> + class sum : public mln::accu::internal::base< S, sum<I,S> > { - typedef mln::accu::internal::base< unsigned, card > super_; + typedef mln::accu::internal::base< S, sum > super_; public: - typedef mln_psite(I) argument; + typedef mln_value(I) argument; - card(); + sum(); /// Manipulators. /// \{ void init(); - void take(const argument& s); - void take(const card& other); - + void take(const argument& v); void take(const util::pix& px); + void take(const sum<I,S>& other); - void take(); - void take_as_init(); - using super_::take_as_init; + void take_as_init(const argument& v); + void take_as_init(const util::pix& px); /// \} /// Get the value of the accumulator. - unsigned to_result() const; + S to_result() const; /// Check whether this accu is able to return a result. - /// Always true here. + /// Return always true. bool is_valid() const; protected: - /// The value. - unsigned c_; + + /// The sum value. + S s_; }; # ifndef MLN_INCLUDE_ONLY - template <typename I> + template <typename I, typename S> inline - card::card() + sum<I,S>::sum() { init(); } - template <typename I> + template <typename I, typename S> inline void - card::init() + sum<I,S>::init() { - c_ = 0; + s_ = literal::zero; } - template <typename I> + // take. + + template <typename I, typename S> inline void - card::take(const argument&) + sum<I,S>::take(const argument& v) { - take(); + s_ += v; } - template <typename I> + template <typename I, typename S> inline void - card::take(const card& other) + sum<I,S>::take(const util::pix& px) { - c_ += other.c_; + take(px.v()); } - template <typename I> + template <typename I, typename S> inline void - card::take(const util::pix&) + sum<I,S>::take(const sum<I,S>& other) { - take(); + s_ += other.s_; } - template <typename I> + // take_as_init. + + template <typename I, typename S> inline void - card::take() + sum<I,S>::take_as_init(const argument& v) { - ++c_; + s_ = v; } - template <typename I> + template <typename I, typename S> inline void - card::take_as_init() + sum<I,S>::take_as_init(const util::pix& px) { - init(); - take(); + take_as_init(px.v()); } - template <typename I> + template <typename I, typename S> inline - unsigned - card::to_result() const + S + sum<I,S>::to_result() const { - return c_; + return s_; } - template <typename I> + template <typename I, typename S> inline bool - card::is_valid() const + sum<I,S>::is_valid() const { return true; } @@ -195,4 +200,4 @@ } // end of namespace mln -#endif // ! MLN_MORPHO_ATTRIBUTE_CARD_HH +#endif // ! MLN_MORPHO_ATTRIBUTE_SUM_HH Index: mln/morpho/attribute/volume.hh --- mln/morpho/attribute/volume.hh (revision 3367) +++ mln/morpho/attribute/volume.hh (working copy) @@ -103,6 +103,9 @@ /// Always true here. bool is_valid() const; + /// Give the area. + unsigned area() const; + protected: /// The current level. mln_value(I) level_; @@ -197,6 +200,14 @@ template <typename I> inline + unsigned + volume::area() const + { + return area_; + } + + template <typename I> + inline bool volume::is_valid() const { Index: mln/morpho/attribute/all.hh --- mln/morpho/attribute/all.hh (revision 3367) +++ mln/morpho/attribute/all.hh (working copy) @@ -46,6 +46,8 @@ # include <mln/morpho/attribute/card.hh> +# include <mln/morpho/attribute/sum.hh> +# include <mln/morpho/attribute/volume.hh> #endif // ! MLN_MORPHO_ATTRIBUTE_ALL_HH Index: mln/morpho/attribute/card.hh --- mln/morpho/attribute/card.hh (revision 3367) +++ mln/morpho/attribute/card.hh (working copy) @@ -88,13 +88,13 @@ /// \{ void init(); + void take(); void take(const argument& s); - void take(const card& other); - void take(const util::pix& px); + void take(const card& other); - void take(); void take_as_init(); + void take_as_init(const util::pix& px); using super_::take_as_init; /// \} @@ -129,20 +129,22 @@ c_ = 0; } + // take. + template <typename I> inline void - card::take(const argument&) + card::take() { - take(); + ++c_; } template <typename I> inline void - card::take(const card& other) + card::take(const argument&) { - c_ += other.c_; + take(); } template <typename I> @@ -156,11 +158,13 @@ template <typename I> inline void - card::take() + card::take(const card& other) { - ++c_; + c_ += other.c_; } + // take_as_init. + template <typename I> inline void @@ -172,6 +176,14 @@ template <typename I> inline + void + card::take_as_init(const util::pix&) + { + take_as_init(); + } + + template <typename I> + inline unsigned card::to_result() const { Index: tests/morpho/attribute/sum.cc --- tests/morpho/attribute/sum.cc (revision 0) +++ tests/morpho/attribute/sum.cc (revision 0) @@ -0,0 +1,53 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/// \file tests/morpho/attribute/sum.cc +/// +/// Test on mln::morpho::attribute::sum. + +#include <mln/core/image/image2d.hh> +#include <mln/morpho/attribute/sum.hh> + + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + I ima(3, 3); + + point2d p(0, 0); + ima(p) = 17; + + util::pix px(ima, p); + + morpho::attribute::sum s; + s.take(px); + s.take(px); + s.take(px); + mln_assertion(s == 51); +} Index: tests/morpho/attribute/Makefile.am --- tests/morpho/attribute/Makefile.am (revision 3367) +++ tests/morpho/attribute/Makefile.am (working copy) @@ -3,8 +3,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - card + card \ + sum \ + volume card_SOURCES = card.cc +sum_SOURCES = sum.cc +volume_SOURCES = volume.cc TESTS = $(check_PROGRAMS) Index: tests/morpho/attribute/volume.cc --- tests/morpho/attribute/volume.cc (revision 0) +++ tests/morpho/attribute/volume.cc (revision 0) @@ -0,0 +1,48 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/// \file tests/morpho/attribute/volume.cc +/// +/// Test on mln::morpho::attribute::volume. + +#include <mln/core/image/image2d.hh> +#include <mln/morpho/attribute/volume.hh> + + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + I ima(3, 3); + + util::pix px(ima, point2d(0,0)); + + morpho::attribute::volume v; + v.take(px); + mln_assertion(v == 1); +}

1 0

3367: Add a label wrapper in fun::l2l.
by Thierry Geraud 13 Feb '09

13 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a label wrapper in fun::l2l. * mln/fun/l2l/wrap.hh: New. * mln/fun/l2l/all.hh: Update. * tests/fun/l2l: New directory. * tests/fun/Makefile.am: Update. * tests/fun/l2l/wrap.cc: New. * tests/fun/l2l/Makefile.am: New. mln/fun/l2l/all.hh | 4 +- mln/fun/l2l/wrap.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++++ tests/fun/Makefile.am | 2 - tests/fun/l2l/Makefile.am | 10 +++++ tests/fun/l2l/wrap.cc | 58 ++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 2 deletions(-) Index: mln/fun/l2l/all.hh --- mln/fun/l2l/all.hh (revision 3366) +++ mln/fun/l2l/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -49,6 +50,7 @@ # include <mln/fun/l2l/relabel.hh> +# include <mln/fun/l2l/wrap.hh> Index: mln/fun/l2l/wrap.hh --- mln/fun/l2l/wrap.hh (revision 0) +++ mln/fun/l2l/wrap.hh (revision 0) @@ -0,0 +1,87 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_FUN_L2L_WRAP_HH +# define MLN_FUN_L2L_WRAP_HH + +/// \file mln/fun/l2l/wrap.hh +/// +/// Function to wrap labels such as 0 -> 0 and [1, lmax] maps to [1, +/// Lmax] (using modulus). +/// +/// \todo Prefer not to cast towards 'unsigned long'; use a procedure +/// such as enc(l) that can work on 'unsigned', 'int_u8', 'label<n>', and +/// also other label types. + +# include <mln/core/concept/function.hh> + + +namespace mln +{ + + namespace fun + { + + namespace l2l + { + + template <typename L> + struct wrap : public Function_l2l< wrap<L> > + { + public: + + typedef L result; + + template <typename L_> + L operator()(const L_& l_) const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + template <typename L_> + inline + L + wrap<L>::operator()(const L_& l_) const + { + mlc_converts_to(L_, unsigned long)::check(); + unsigned long l = static_cast<unsigned long>(l_); + return l == 0ul ? L(0ul) : L(1 + (l - 1) % 255); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::l2l + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_L2L_WRAP_HH Index: tests/fun/Makefile.am --- tests/fun/Makefile.am (revision 3366) +++ tests/fun/Makefile.am (working copy) @@ -2,4 +2,4 @@ include $(top_srcdir)/milena/tests/tests.mk -SUBDIRS = i2v p2b p2p p2v v2v vv2v x2x +SUBDIRS = i2v p2b l2l p2p p2v v2v vv2v x2x Index: tests/fun/l2l/Makefile.am --- tests/fun/l2l/Makefile.am (revision 0) +++ tests/fun/l2l/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + wrap + +wrap_SOURCES = wrap.cc + +TESTS = $(check_PROGRAMS) Index: tests/fun/l2l/wrap.cc --- tests/fun/l2l/wrap.cc (revision 0) +++ tests/fun/l2l/wrap.cc (revision 0) @@ -0,0 +1,58 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/// \file tests/fun/l2l/wrap.cc +/// +/// Test on mln::fun::l2l::wrap. + +#include <mln/fun/l2l/wrap.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/label_16.hh> + + +int main() +{ + using namespace mln; + + fun::l2l::wrap<value::int_u8> f; + + value::label_16 + l0 = 0, + l1 = 1, + l255 = 255, + l256 = 256, + l510 = 510, + l511 = 511; + + mln_assertion( f(l0) == 0 ); + mln_assertion( f(l1) == 1 ); + mln_assertion( f(l255) == 255 ); + mln_assertion( f(l256) == 1 ); + mln_assertion( f(l510) == 255 ); + mln_assertion( f(l511) == 1 ); +}

1 0

3366: Add some source to get binaries.
by Thierry Geraud 13 Feb '09

13 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some source to get binaries. * theo/exec: New directory. * theo/exec/filetype.hh: New. * theo/exec/elementary_gradient.cc: New. * theo/exec/closing_volume.cc: New. * theo/exec/watershed_flooding.cc: New. * theo/esiee/laurent/ismm09/topo_wst.cc (echo): New. (L): Change from 16 to 32 bit. * theo/esiee/laurent/ismm09/pseudo_tree.hh: Use echo. esiee/laurent/ismm09/pseudo_tree.hh | 7 +- esiee/laurent/ismm09/topo_wst.cc | 27 +++++++--- exec/closing_volume.cc | 60 ++++++++++++++++++++++ exec/elementary_gradient.cc | 90 +++++++++++++++++++++++++++++++++ exec/filetype.hh | 54 ++++++++++++++++++++ exec/watershed_flooding.cc | 96 ++++++++++++++++++++++++++++++++++++ 6 files changed, 326 insertions(+), 8 deletions(-) Index: theo/exec/filetype.hh --- theo/exec/filetype.hh (revision 0) +++ theo/exec/filetype.hh (revision 0) @@ -0,0 +1,54 @@ +#include <string> + +// 2d +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +// 3d +#include <mln/core/image/image3d.hh> +#include <mln/core/alias/neighb3d.hh> + + +// pbm +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + +// pgm +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +// ppm +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> + + +//dump +#include <mln/io/dump/load.hh> +#include <mln/io/dump/save.hh> + + +namespace mln +{ + + namespace filetype + { + enum id { pbm, pgm, ppm, dump, unknown }; + } + + filetype::id + get_filetype(const std::string& filename) + { + if (filename.find(".pbm") == filename.length() - 4) + return filetype::pbm; + if (filename.find(".pgm") == filename.length() - 4) + return filetype::pgm; + if (filename.find(".ppm") == filename.length() - 4) + return filetype::ppm; + if (filename.find(".dump") == filename.length() - 5) + return filetype::dump; + return filetype::unknown; + } + +} // mln + + Index: theo/exec/elementary_gradient.cc --- theo/exec/elementary_gradient.cc (revision 0) +++ theo/exec/elementary_gradient.cc (revision 0) @@ -0,0 +1,90 @@ +#include "filetype.hh" +#include <mln/morpho/elementary/gradient.hh> +#include <mln/morpho/elementary/gradient_internal.hh> +#include <mln/morpho/elementary/gradient_external.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.xxx kind output.xxx" << std::endl + << " Elementary gradient." << std::endl + << " kind is 0 (external), 1 (internal), or 2 (thick)." << std::endl + << " xxx in { pgm, dump }" << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + std::string filename = argv[1]; + int kind = std::atoi(argv[2]); + if (kind < 0 || kind > 2) + { + std::cerr << "bad kind!" << std::endl; + usage(argv); + } + + switch (get_filetype(argv[1])) + { + case filetype::pgm: + { + image2d<int_u8> ima, grad; + io::pgm::load(ima, argv[1]); + switch (kind) + { + case 0: + grad = morpho::elementary::gradient_external(ima, c4()); + break; + case 1: + grad = morpho::elementary::gradient_internal(ima, c4()); + break; + case 2: + grad = morpho::elementary::gradient(ima, c4()); + break; + } + io::pgm::save(grad, argv[3]); + } + break; + + case filetype::dump: + { + image3d<int_u8> ima, grad; + io::dump::load(ima, argv[1]); + switch (kind) + { + case 0: + grad = morpho::elementary::gradient_external(ima, c6()); + break; + case 1: + grad = morpho::elementary::gradient_internal(ima, c6()); + break; + case 2: + grad = morpho::elementary::gradient(ima, c6()); + break; + } + io::dump::save(grad, argv[3]); + } + break; + + case filetype::unknown: + std::cerr << "unknown filename extension!" << std::endl; + usage(argv); + break; + + default: + std::cerr << "file type not handled!" << std::endl; + usage(argv); + } + + trace::exiting("main"); +} Index: theo/exec/closing_volume.cc --- theo/exec/closing_volume.cc (revision 0) +++ theo/exec/closing_volume.cc (revision 0) @@ -0,0 +1,60 @@ +#include "filetype.hh" +#include <mln/morpho/closing_volume.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.xxx lambda output.xxx" << std::endl + << " Volume closing." << std::endl + << " xxx in { pgm, dump }" << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + std::string filename = argv[1]; + unsigned lambda = atoi(argv[2]); + + switch (get_filetype(argv[1])) + { + case filetype::pgm: + { + image2d<int_u8> ima, clo; + io::pgm::load(ima, argv[1]); + clo = morpho::closing_volume(ima, c4(), lambda); + io::pgm::save(clo, argv[3]); + } + break; + + case filetype::dump: + { + image3d<int_u8> ima, clo; + io::dump::load(ima, argv[1]); + clo = morpho::closing_volume(ima, c6(), lambda); + io::dump::save(clo, argv[3]); + } + break; + + case filetype::unknown: + std::cerr << "unknown filename extension!" << std::endl; + usage(argv); + break; + + default: + std::cerr << "file type not handled!" << std::endl; + usage(argv); + } + + trace::exiting("main"); +} Index: theo/exec/watershed_flooding.cc --- theo/exec/watershed_flooding.cc (revision 0) +++ theo/exec/watershed_flooding.cc (revision 0) @@ -0,0 +1,96 @@ +#include "filetype.hh" + +#include <mln/morpho/watershed/flooding.hh> +#include <mln/value/label_16.hh> + +#include <mln/level/transform.hh> +#include <mln/convert/to_fun.hh> + + +namespace mln +{ + + mln::value::int_u8 L_to_int_u8(unsigned u) + { + return u == 0 ? + 0 : // wshed line + 1 + (u - 1) % 255; // basin + } + +} // mln + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.xxx output.yyy" << std::endl + << " Watershed flooding." << std::endl + << " xxx in { pgm, dump }" << std::endl + << " yyy in { pbm, pgm, dump }" << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + typedef value::label_16 L; + if (argc != 3) + usage(argv); + + trace::entering("main"); + + std::string filename = argv[1]; + L n_basins; + + switch (get_filetype(argv[1])) + { + case filetype::pgm: + { + image2d<int_u8> ima; + io::pgm::load(ima, argv[1]); + image2d<L> wst = morpho::watershed::flooding(ima, c4(), n_basins); + if (get_filetype(argv[2]) == filetype::dump) + { + io::dump::save(wst, argv[2]); + } + else if (get_filetype(argv[2]) == filetype::pgm) + { + io::pgm::save( level::transform(wst, convert::to_fun(L_to_int_u8)), + argv[2] ); + } + else if (get_filetype(argv[2]) == filetype::pbm) + { + io::pbm::save( (pw::value(wst) == 0u) | wst.domain(), + argv[2] ); + } + else + { + std::cerr << "Bad output file format!" << std::endl; + std::abort(); + } + } + break; + + case filetype::dump: + { + image3d<int_u8> ima; + io::dump::load(ima, argv[1]); + image3d<L> wst = morpho::watershed::flooding(ima, c6(), n_basins); + io::dump::save(wst, argv[2]); + } + break; + + case filetype::unknown: + std::cerr << "unknown filename extension!" << std::endl; + usage(argv); + break; + + default: + std::cerr << "file type not handled!" << std::endl; + usage(argv); + } + + trace::exiting("main"); +} Index: theo/esiee/laurent/ismm09/topo_wst.cc --- theo/esiee/laurent/ismm09/topo_wst.cc (revision 3365) +++ theo/esiee/laurent/ismm09/topo_wst.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/var.hh> -#include <mln/value/label_16.hh> +#include <mln/value/label.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -17,8 +17,9 @@ void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.pgm" << std::endl; + std::cerr << "usage: " << argv[0] << " input.pgm echo" << std::endl; std::cerr << "Laurent topological watershed transform thru ISMM 2009 scheme." << std::endl; + std::cerr << "echo = 0 (none) or 1 (effective)." << std::endl; abort(); } @@ -29,27 +30,38 @@ { using namespace mln; using value::int_u8; - using value::label_16; - if (argc != 2) + + if (argc != 3) usage(argv); + int echo = std::atoi(argv[2]); + if (echo != 0 && echo != 1) + { + std::cerr << "Bad 'echo' value!" << std::endl; + usage(argv); + } + + // f: regular image. image2d<int_u8> f; io::pgm::load(f, argv[1]); + + if (echo) debug::println("f:", f); // g: weights on edges. mln_VAR(g, cplx2d::f_to_g(f) ); + if (echo) debug::println("g:", g); // r: one pixel is one region. - typedef label_16 L; + typedef value::label<32> L; L l_max = f.nsites(); image2d<L> w_ext(2 * f.nrows() - 1, 2 * f.ncols() - 1); @@ -61,6 +73,7 @@ for_all(p) w_pixel(p) = ++l; } + if (echo) debug::println("w_ext:", w_ext); @@ -83,6 +96,7 @@ util::array<L> l_ = sort_by_increasing_attributes(a, l_max); + if (echo) { std::cout << "l_:" << std::endl; for (unsigned i = 1; i <= l_max; ++i) @@ -95,5 +109,6 @@ // -> pseudo-tree - compute_pseudo_tree(w_ext, g, l_, a, e_to_l1_l2); + compute_pseudo_tree(w_ext, g, l_, a, e_to_l1_l2, + echo); } Index: theo/esiee/laurent/ismm09/pseudo_tree.hh --- theo/esiee/laurent/ismm09/pseudo_tree.hh (revision 3365) +++ theo/esiee/laurent/ismm09/pseudo_tree.hh (working copy) @@ -212,7 +212,8 @@ const G& g, // FIXME: Directly input g_line? const util::array<L>& l_, const util::array<A>& a, - const F& e_to_l1_l2) + const F& e_to_l1_l2, + bool echo = true) { typedef mln_value(G) T; // <--- Type of edge values. @@ -303,6 +304,7 @@ epar(e) = e; z_epar(e) = e; } + if (echo) debug::println("epar (init):", epar); // epar(e) == e so we depict the edges! } @@ -455,7 +457,7 @@ } // end of "for every region with increasing attribute" - + if (echo) { // Display 'aa' over all edges. @@ -543,6 +545,7 @@ aa_line), c4().win()), aa_line); + if (echo) debug::println("aa ext:", aa_ext); }

1 0

milena r3365: Add fill_holes() function in new file
by Fabien Freling 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-02-12 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add fill_holes() function in new file. * mln/labeling/fill_holes.hh: Implement fill_holes(). --- fill_holes.hh | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) Index: trunk/milena/mln/labeling/fill_holes.hh =================================================================== --- trunk/milena/mln/labeling/fill_holes.hh (revision 0) +++ trunk/milena/mln/labeling/fill_holes.hh (revision 3365) @@ -0,0 +1,118 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_LABELING_FILL_HOLES_HH +# define MLN_LABELING_FILL_HOLES_HH + +/// \file mln/labeling/fill_holes.hh +/// +/// Filling holes of a single object in a binary image. + +# include <mln/labeling/background.hh> +# include <mln/labeling/compute.hh> + +# include <mln/accu/count.hh> + +# include <mln/value/int_u8.hh> + + +namespace mln +{ + + namespace labeling + { + + /// Filling holes of a single object in a binary image. + /// + /// \param[in] input The input image. + /// \param[in] nbh The connexity of the background. + /// \param[out] nlabels The number of labels. + /// \return The binary image with a simple object without holes. + /// + /// \pre The input image has to be binary (checked at compile-time). + /// + /// This routine actually calls mln::labeling::background + /// + /// \see mln::labeling::background + /// + template <typename I, typename N, typename L> + I + fill_holes(const Image& input, const Neighborhood<N>& nbh, + L& nlabels); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename N, typename L> + inline + I + fill_holes(const Image& input, const Neighborhood<N>& nbh, + L& nlabels) + { + trace::entering("labeling::fill_holes"); + + mlc_equal(mln_trait_image_kind(I), + mln::trait::image::kind::binary)::check(); + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); + + using value::int_u8; + + mln_ch_value(I, bool) output; + initialize(output, input); + data::fill(output, false); + + accu::count<int_u8> a_; + mln_ch_value(I, L) lbls = labeling::background(input, nbh, nlabels); + util::array<unsigned> arr = labeling::compute(a_, input, lbls, nlabels); + int bg_count = 0; + int bg_lbl = 0; + + for (int i = 0; i < arr.nelements(); ++i) + { + if (arr[i] > bg_count) + { + bg_count = arr[i]; + bg_lbl = i; + } + } + + data::fill((output | pw::value(lbls) != bg_lbl).rw(), true); + + trace::exiting("labeling::fill_holes"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + + +#endif // ! MLN_LABELING_FILL_HOLES_HH

1 0

r3364: Call the fill_holes() function
by Fabien Freling 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-12 Fabien Freling <fabien.freling(a)lrde.epita.fr> Call the fill_holes() function. * fabien/igr/igr.cc: Call the fill_holes() function instead of doing the computation. --- igr.cc | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) Index: trunk/milena/sandbox/fabien/igr/igr.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/igr.cc (revision 3363) +++ trunk/milena/sandbox/fabien/igr/igr.cc (revision 3364) @@ -52,6 +52,7 @@ #include <mln/labeling/blobs.hh> #include <mln/labeling/compute.hh> +#include <mln/labeling/fill_holes.hh> #include <mln/level/compare.hh> #include <mln/level/transform.hh> @@ -160,21 +161,24 @@ // Fill holes. + big_second = labeling::fill_holes(big_second, nbh, nlabels); // box<mln_site(I)> h_box = geom::bbox((in_bool | pw::value(labels) == big_second_lbl).domain()); //h_box.enlarge(1); - mln_ch_value(I, L) h_lbls = labeling::background(big_second /*in_bool | h_box*/, nbh, nlabels); - util::array<unsigned> arr_holes = labeling::compute(a_, big_second /*in_bool | h_box*/, h_lbls, nlabels); - int bg_count = 0; - int bg_lbl = 0; - for (int i = 0; i < arr_holes.nelements(); ++i) - { - if (arr_holes[i] > bg_count) - { - bg_count = a[i]; - bg_lbl = i; - } - } - data::fill((/*(*/big_second /*in_bool | h_box).rw()*/ | pw::value(h_lbls) != bg_lbl).rw(), true); + + //mln_ch_value(I, L) h_lbls = labeling::background(big_second /*in_bool | h_box*/, nbh, nlabels); + //util::array<unsigned> arr_holes = labeling::compute(a_, big_second /*in_bool | h_box*/, h_lbls, nlabels); + //int bg_count = 0; + //int bg_lbl = 0; + //for (int i = 0; i < arr_holes.nelements(); ++i) + //{ + // if (arr_holes[i] > bg_count) + // { + // bg_count = a[i]; + // bg_lbl = i; + // } + //} + //data::fill((/*(*/big_second /*in_bool | h_box).rw()*/ | pw::value(h_lbls) != bg_lbl).rw(), true); + /*return level::transform(h_lbls, L_to_int_u8<label_16>());*/ // Gradient. @@ -218,11 +222,11 @@ image2d<int_u8> src; io::pgm::load(src, "img/slice_7.pgm"); - image3d<int_u8> vol; - io::dump::load(vol, "img/IRM.dump"); + //image3d<int_u8> vol; + //io::dump::load(vol, "img/IRM.dump"); label_16 nlabels; - //io::ppm::save(igr(src, c4(), nlabels), "slice_out.ppm"); - io::dump::save(igr(vol, c6(), nlabels), "vol_out.dump"); + io::ppm::save(igr(src, c4(), nlabels), "slice_out.ppm"); + //io::dump::save(igr(vol, c6(), nlabels), "vol_out.dump"); }

1 0

scool r146: Add tests
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Add tests. * concept/scool_ast/concept_1.aterm: New. * concept/scool_ast/concept_2.aterm: New. * concept/scool_ast/concept_3.aterm: New. * concept/scool_ast/concept_4.aterm: New. --- concept_1.aterm | 1 + concept_2.aterm | 1 + concept_3.aterm | 1 + concept_4.aterm | 1 + 4 files changed, 4 insertions(+) Index: branches/scool-ng/tests/concept/scool_ast/concept_1.aterm =================================================================== --- branches/scool-ng/tests/concept/scool_ast/concept_1.aterm (revision 0) +++ branches/scool-ng/tests/concept/scool_ast/concept_1.aterm (revision 146) @@ -0,0 +1 @@ +Program([ConceptDeclaration(Identifier("box"),ConceptBlock([TypeDeclaration(None,Identifier("value")),FunctionDeclaration(None,Identifier("get_value"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value")))]))]) Index: branches/scool-ng/tests/concept/scool_ast/concept_2.aterm =================================================================== --- branches/scool-ng/tests/concept/scool_ast/concept_2.aterm (revision 0) +++ branches/scool-ng/tests/concept/scool_ast/concept_2.aterm (revision 146) @@ -0,0 +1 @@ +Program([ConceptDeclaration(Identifier("box"),ConceptBlock([TypeDeclaration(None,Identifier("value")),FunctionDeclaration(Some("mutable"),Identifier("set_value"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("val"),SimpleType("value"))]),SimpleType("value")))]))]) Index: branches/scool-ng/tests/concept/scool_ast/concept_3.aterm =================================================================== --- branches/scool-ng/tests/concept/scool_ast/concept_3.aterm (revision 0) +++ branches/scool-ng/tests/concept/scool_ast/concept_3.aterm (revision 146) @@ -0,0 +1 @@ +Program([ConceptDeclaration(Identifier("box"),ConceptBlock([TypeDeclaration(None,Identifier("value")),FunctionDeclaration(Some("mutable"),Identifier("set_value"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("val"),SimpleType("value"))]),SimpleType("value"))),FunctionDeclaration(None,Identifier("get_value"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value")))]))]) Index: branches/scool-ng/tests/concept/scool_ast/concept_4.aterm =================================================================== --- branches/scool-ng/tests/concept/scool_ast/concept_4.aterm (revision 0) +++ branches/scool-ng/tests/concept/scool_ast/concept_4.aterm (revision 146) @@ -0,0 +1 @@ +Program([ConceptDeclaration(Identifier("box"),ConceptBlock([TypeDeclaration(None,Identifier("value")),FunctionDeclaration(Some("mutable"),Identifier("set_value"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("val"),SimpleType("value"))]),SimpleType("value"))),FunctionDeclaration(None,Identifier("get_value"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value"))),FunctionDeclaration(None,Identifier("print_value"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")))]))])

1 0

scool r145: Add concept declaration in the grammar
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Add concept declaration in the grammar. * scl-syn/Concept.sdf: New. * scl-syn/Declaration.sdf: Here. --- Concept.sdf | 10 ++++++++++ Declaration.sdf | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 144) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 145) @@ -1,7 +1,7 @@ module Declaration imports - Lexical Type Statement Expression Class + Lexical Type Statement Expression Class Concept exports sorts Declaration Block FunctionBlock SimpleDeclaration StaticFunction ExpressionInitialiser StaticExpressionInitialiser @@ -37,3 +37,5 @@ Identifier ":" ClassQualifier? "class" ClassWhereClause? ";" -> Declaration {cons("ClassDeclaration")} Identifier ":" ClassQualifier? "class" ClassWhereClause? "=" ClassBlock -> Declaration {cons("ClassDefinition")} + + Identifier ":" "concept" "=" ConceptBlock -> Declaration {cons("ConceptDeclaration")} Index: branches/scool-ng/src/scl-syn/Concept.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Concept.sdf (revision 0) +++ branches/scool-ng/src/scl-syn/Concept.sdf (revision 145) @@ -0,0 +1,10 @@ +module Concept + +imports + Lexical Type Statement Expression Class + +exports + sorts Concept + context-free syntax + + "{" Declaration* "}" -> ConceptBlock {cons("ConceptBlock")}

1 0

r3362: Merge algebraic and leveling filter, and implement dispatch
by Edwin Carlinet 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Merge algebraic and leveling filter, and implement dispatch. * edwin/Makefile: Fix some bugs. * edwin/filtres/connectes/Makefile: New. * edwin/filtres/connectes/connected_filter.hh: File merging algebraic and leveling filter. * edwin/filtres/connectes/filter.cc: Main file for testing. * edwin/filtres/connectes: New. * edwin/filtres: New. --- Makefile | 18 - filtres/connectes/Makefile | 32 + filtres/connectes/connected_filter.hh | 556 ++++++++++++++++++++++++++++++++++ filtres/connectes/filter.cc | 47 ++ 4 files changed, 650 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/edwin/filtres/connectes/connected_filter.hh =================================================================== --- trunk/milena/sandbox/edwin/filtres/connectes/connected_filter.hh (revision 0) +++ trunk/milena/sandbox/edwin/filtres/connectes/connected_filter.hh (revision 3362) @@ -0,0 +1,556 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_CANVAS_MORPHO_CONNECTED_FILTER_HH +# define MLN_CANVAS_MORPHO_CONNECTED_FILTER_HH + +/// \file mln/canvas/morpho/connected_filter.hh +/// +/// Connected filters dispatch (algebraic & leveling filters). +/// +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/concept/accumulator.hh> + +# include <mln/trait/accumulators.hh> + +# include <mln/level/sort_psites.hh> +# include <mln/level/sort_offsets.hh> + + +namespace mln { + namespace canvas { + namespace morpho { + + // Facade Fwd Declaration + template <typename I, typename N, typename A> + mln_concrete(I) + connected_filter(const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl { + + template <typename A, typename I> + void take_as_init_fastest (trait::accumulator::when_pix::use_none, A& accu, + const I& input, const unsigned p) + { + accu.take_as_init (); + } + + template <typename A, typename I, typename P> + void take_as_init (trait::accumulator::when_pix::use_p, A& accu, + const I& input, const P& p) + { + accu.take_as_init (p); + } + + template <typename A, typename I, typename P> + void take_as_init (trait::accumulator::when_pix::use_none, A& accu, + const I& input, const P& p) + { + accu.take_as_init (p); + } + + template <typename A, typename I, typename P> + void take_as_init (trait::accumulator::when_pix::use_pix, A& accu, + const I& input, const P& p) + { + accu.take_as_init (make::pix(input, p)); + } + + template <typename A, typename I, typename P> + void take_as_init (trait::accumulator::when_pix::use_v, A& accu, + const I& input, const P& p) + { + accu.take_as_init (make::pix(input, p)); + } + + template <typename A, typename I> + void take_as_init_fastest (trait::accumulator::when_pix::use_v, A& accu, + const I& input, const unsigned p) + { + accu.take_as_init (input.element (p)); + } + + + template <typename A, typename I, typename P> + void take_as_init (A& accu, const I& input, const P& p) + { + take_as_init (mln_trait_accumulator_when_pix(A)(), accu, input, p); + } + + template <typename A, typename I, typename P> + void take_as_init_fastest (A& accu, const I& input, const P& p) + { + take_as_init_fastest (mln_trait_accumulator_when_pix(A)(), accu, input, p); + } + + + namespace generic { + + + //////////////////////// + /// Generic version. /// + //////////////////////// + + + template <typename I> + static inline + mln_psite(I) + find_root(I& parent, const mln_psite(I) & x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + template <typename I, typename N, typename S, typename A> + mln_concrete(I) + connected_filter (const Image& input_, + const Neighborhood<N>& nbh_, + const Site_Set<S>& s_, + const Accumulator<A>& a_, + const typename A::result& lambda) + { + trace::entering("canvas::morpho::impl::generic::connected_filter"); + // FIXME: Test?! + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + const S& s = exact(s_); + (void)a_; // To avoid warning at compilation + + mln_concrete(I) output; + initialize(output, input); + + // Local type. + typedef mln_psite(I) P; + + + // Auxiliary data. + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, bool) activity; + mln_ch_value(I, P) parent; + mln_ch_value(I, A) data; + + // Initialization. + { + initialize(deja_vu, input); + mln::data::fill(deja_vu, false); + initialize(activity, input); + mln::data::fill(activity, true); + initialize(parent, input); + initialize(data, input); + //a.init(); // init required. + } + + // First pass. + { + mln_fwd_piter(S) p(s); // s required. + mln_niter(N) n(nbh, p); + + for_all(p) + { + // Make set. + { + parent(p) = p; + + // Check accumulator trait to handle argument type (Pix or Site). + take_as_init (data(p), input, p); + } + + for_all(n) + if (input.domain().has(n) && deja_vu(n)) + { + //do_union(n, p); + P r = find_root(parent, n); + if (r != p) + { + if (input(r) == input(p) || (activity(r) && (data(r) < lambda))) // Equiv(r, p) + // Either a flat zone or the component of r is still growing. + { + /* FIXME: Same remark as above concerning the + initialization of data(p); instead of + + data(p).take(data(r)); + + we should (or could) have + + unite_data(p, r); + + so as to keep the generic aspect of this canvas + (as long as the set of acceptable types for the + template parameter A is not bound). */ + + data(p).take(data(r)); + parent(r) = p; + if (activity(r) == false) + activity(p) = false; + } + else + { + activity(p) = false; + } + } + } + deja_vu(p) = true; + } + } + + // Second pass. + { + mln_bkd_piter(S) p(s); + for_all(p) + if (parent(p) == p) // p is root. + output(p) = input(p); + else + output(p) = output(parent(p)); + } + + trace::exiting("canvas::morpho::impl::generic::connected_filter"); + return output; + } + + } // end of namespace mln::canvas::morpho::impl::generic + + + //////////////////////// + /// Fastest version. /// + //////////////////////// + + template <typename I> + inline + unsigned + find_root_fastest(I& parent, unsigned x) + { + if (parent.element(x) == x) + return x; + else + return parent.element(x) = find_root_fastest(parent, parent.element(x)); + } + + template <typename I, typename N, typename A> + mln_concrete(I) + connected_filter_fastest(const Image& input_, + const Neighborhood<N>& nbh_, + const util::array<unsigned>& s, + const Accumulator<A>& a_, + const typename A::result& lambda) + { + trace::entering("canvas::morpho::impl::connected_filter_fastest"); + + // FIXME: Tests? + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + mln_concrete(I) output; + initialize(output, input); + + // Local type. + typedef mln_psite(I) P; + + // Auxiliary data. + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, bool) activity; + mln_ch_value(I, unsigned) parent; + mln_ch_value(I, A) data; + + // Initialization. + { + initialize(deja_vu, input); + mln::data::fill(deja_vu, false); + initialize(activity, input); + mln::data::fill(activity, true); + initialize(parent, input); + mln::data::fill(parent, 0); + initialize(data, input); + } + + util::array<int> dp = offsets_wrt(input, nbh); + const unsigned n_nbhs = dp.nelements(); + const unsigned n_points = s.nelements(); + + // First pass. + { + for (unsigned i = 0; i < n_points; ++i) + { + unsigned p = s[i]; // An offset. + + // Make set. + parent.element(p) = p; + + // Check accumulator trait to handle argument type (Value or None). + take_as_init_fastest (data.element(p), input, p); + + for (unsigned j = 0; j < n_nbhs; ++j) + { + unsigned n = p + dp[j]; + if (!deja_vu.element(n)) + continue; + + unsigned r = find_root_fastest(parent, n); + if (r != p) + { + if (input.element(r) == input.element(p) + || (activity.element(r) + && (data.element(r) < lambda))) + { + data.element(p).take(data.element(r)); + parent.element(r) = p; + if (activity.element(r) == false) + activity.element(p) = false; + } + else + activity.element(p) = false; + } + } + + deja_vu.element(p) = true; + } + } + + + // Second pass. + { + for (int i = n_points - 1; i >= 0 ; --i) + { + unsigned p = s[i]; + if (parent.element(p) == p) // p is root. + output.element(p) = input.element(p); + else + output.element(p) = output.element(parent.element(p)); + } + } + + trace::exiting("canvas::morpho::impl::connected_filter_fastest"); + return output; + } + + + } // end of namespace mln::canvas::morpho::impl + + + + + // Dispatch. + + + namespace internal + { + // Leveling + template <typename I, typename N, typename A> + mln_concrete(I) + leveling_filter_dispatch(metal::false_, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + p_array < mln_psite(I) > s = + increasing ? + level::sort_psites_increasing(input) : + level::sort_psites_decreasing(input); + return impl::generic::connected_filter(input, nbh, s, a, lambda); + } + + template <typename I, typename N, typename A> + mln_concrete(I) + leveling_filter_dispatch(metal::true_, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + util::array<unsigned> s = + increasing ? + level::sort_offsets_increasing(input) : + level::sort_offsets_decreasing(input); + return impl::connected_filter_fastest(input, nbh, s, a, lambda); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + leveling_filter_dispatch(const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + enum + { + test = mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value + && mlc_equal(mln_trait_accumulator_when_pix(A), + trait::accumulator::when_pix::use_v)::value + && mln_is_simple_neighborhood(N)::value + }; + return leveling_filter_dispatch(metal::bool_<test>(), + input, nbh, a, lambda, increasing); + } + + // Alegebraic + template <typename I, typename N, typename A> + inline + mln_concrete(I) + algebraic_filter_dispatch(metal::false_, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& accu, + const mln_result(A)& lambda, + bool increasing) + { + p_array<mln_psite(I)> s = increasing ? + level::sort_psites_increasing(input) : + level::sort_psites_decreasing(input); + return impl::generic::connected_filter(input, nbh, s, accu, lambda); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + algebraic_filter_dispatch(metal::true_, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& accu, + const mln_result(A)& lambda, + bool increasing) + { + util::array<unsigned> s = increasing ? + level::sort_offsets_increasing(input) : + level::sort_offsets_decreasing(input); + return impl::connected_filter_fastest(input, nbh, s, accu, lambda); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + algebraic_filter_dispatch(const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& accu, + const mln_result(A)& lambda, + bool increasing) + { + enum { + test = (mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value && + mln_is_simple_neighborhood(N)::value && + mlc_equal(mln_trait_accumulator_when_pix(A), + trait::accumulator::when_pix::use_none)::value) + }; + return algebraic_filter_dispatch(metal::bool_<test>(), input, nbh, + accu, lambda, increasing); + } + + + + //connected + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_none, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + return algebraic_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_p, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + return algebraic_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_v, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + return leveling_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_pix, + const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + return leveling_filter_dispatch(input, nbh, a, lambda, increasing); + } + } // end of namespace mln::canvas::morpho::internal + + +# endif // ! MLN_INCLUDE_ONLY + + // Facade. + + template <typename I, typename N, typename A> + mln_concrete(I) + connected_filter(const Image& input, + const Neighborhood<N>& nbh, + const Accumulator<A>& a, + const typename A::result& lambda, + bool increasing) + { + return internal::connected_filter_dispatch(mln_trait_accumulator_when_pix(A)(), + input, nbh, a, lambda, increasing); + } + + + } // end of namespace mln::canvas::morpho + } // end of namespace mln::canvas +} // end of namespace mln + + +#endif // ! MLN_CANVAS_MORPHO_CONNECTED_FILTER_HH Index: trunk/milena/sandbox/edwin/filtres/connectes/filter.cc =================================================================== --- trunk/milena/sandbox/edwin/filtres/connectes/filter.cc (revision 0) +++ trunk/milena/sandbox/edwin/filtres/connectes/filter.cc (revision 3362) @@ -0,0 +1,47 @@ + + +#include <mln/core/image/image2d.hh> +#include <mln/io/pgm/all.hh> +#include <mln/util/timer.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/morpho/attribute/volume.hh> +#include "connected_filter.hh" + +int main(int argc, char** argv) +{ + using namespace mln; + using value::int_u8; + + std::cout << "Leveling filter test" << std::endl; + + typedef mln::image2d<int_u8> I; + I lena; + + float elapsed; + mln::util::timer chrono; + mln::morpho::attribute::volume c; + int lambda = atoi(argv[1]); + + mln::io::pgm::load(lena, "../../../../img/lena.pgm"); + I out; + + chrono.start(); + out = mln::canvas::morpho::connected_filter(lena, c4(), c, lambda, true); + elapsed = chrono.stop(); + std::cout << "(auto) " << elapsed << "s" << std::endl; + mln::io::pgm::save(out, "auto.pgm"); + + chrono.start(); + out = mln::canvas::morpho::internal::leveling_filter_dispatch(mln::metal::true_(), lena, c4(), c, lambda, true); + elapsed = chrono.stop(); + std::cout << "(fast) " << elapsed << "s" << std::endl; + + mln::io::pgm::save(out, "fast.pgm"); + + chrono.start(); + out = mln::canvas::morpho::internal::leveling_filter_dispatch(mln::metal::false_(), lena, c4(), c, lambda, true); + elapsed = chrono.stop(); + std::cout << "(slow) " << elapsed << "s" << std::endl; + + mln::io::pgm::save(out, "slow.pgm"); +} Index: trunk/milena/sandbox/edwin/filtres/connectes/Makefile =================================================================== --- trunk/milena/sandbox/edwin/filtres/connectes/Makefile (revision 0) +++ trunk/milena/sandbox/edwin/filtres/connectes/Makefile (revision 3362) @@ -0,0 +1,32 @@ +TARGET=filter +REF=leveling +SRC=filter.cc +SRC_REF=leveling.cc +OBJS=${SRC:.cc=.o} +OBJS_REF=${SRC_REF:.cc=.o} + +OLENADIR=../../../../.. +MILENADIR=$(OLENADIR)/milena + +CXXFLAGS=-I$(MILENADIR) -I./ -DNDEBUG -O3 -ffast-math +CXX=g++ +LD=g++ +LDFLAGS= + +all: $(TARGET) + +$(TARGET): $(OBJS) $(SRC) + $(LD) $(LDFLAGS) -o $@ $(OBJS) + + +$(REF): $(OBJS_REF) $(SRC_REF) + $(LD) $(LDFLAGS) -o $@ $(OBJS_REF) + +%.o: %.cc + $(CXX) $(CXXFLAGS) -c $< + +%.o: %.hh + $(CXX) $(CXXFLAGS) -c $< + +clean: + rm -f *.o $(REF) $(TARGET) \ No newline at end of file Index: trunk/milena/sandbox/edwin/Makefile =================================================================== --- trunk/milena/sandbox/edwin/Makefile (revision 3361) +++ trunk/milena/sandbox/edwin/Makefile (revision 3362) @@ -1,6 +1,9 @@ -TARGET=algebraic -SRC=algebraic.cc +TARGET=leveling_opt +REF=leveling +SRC=leveling_opt.cc +SRC_REF=leveling.cc OBJS=${SRC:.cc=.o} +OBJS_REF=${SRC_REF:.cc=.o} OLENADIR=../../.. MILENADIR=$(OLENADIR)/milena @@ -10,11 +13,20 @@ LD=g++ LDFLAGS= -$(TARGET): $(OBJS) +all: $(REF) $(TARGET) + +$(TARGET): $(OBJS) $(SRC) $(LD) $(LDFLAGS) -o $@ $(OBJS) + +$(REF): $(OBJS_REF) $(SRC_REF) + $(LD) $(LDFLAGS) -o $@ $(OBJS_REF) + %.o: %.cc $(CXX) $(CXXFLAGS) -c $< %.o: %.hh $(CXX) $(CXXFLAGS) -c $< + +clean: + rm -f *.o $(REF) $(TARGET) \ No newline at end of file

1 0