Olena-patches February 2009

olena-patches@lrde.epita.fr

12 participants
266 discussions

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Minor fixes. * mln/accu/mean.hh (to_result): Make it work even if it is not valid. That is a safety when computing mean values of a collection of labels. * mln/value/label.hh: Fix missing forward declaration. * mln/fun/i2v/array.hh: Upgrade file doc style. accu/mean.hh | 2 ++ fun/i2v/array.hh | 3 +++ value/label.hh | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) Index: mln/accu/mean.hh --- mln/accu/mean.hh (revision 3350) +++ mln/accu/mean.hh (working copy) @@ -151,6 +151,8 @@ mean<T,S,M>::to_result() const { unsigned n = count_.to_result(); + if (n == 0u) + return M(); // Safety. return static_cast<M>(sum_.to_result() / n); } Index: mln/value/label.hh --- mln/value/label.hh (revision 3350) +++ mln/value/label.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// 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 @@ -44,9 +45,10 @@ namespace mln { - // Forward declaration. + // Forward declarations. namespace value { template <unsigned n> struct label; + template <unsigned n> struct int_u; } namespace literal { Index: mln/fun/i2v/array.hh --- mln/fun/i2v/array.hh (revision 3350) +++ mln/fun/i2v/array.hh (working copy) @@ -34,6 +34,9 @@ /// /// \todo Change design so that there is no multiple inheritance: /// array<T> : internal::array_base<T, E==array<T> > : Function_i2v<E> +/// +/// \todo We should convert (with from_to) arrays that do not hold the +/// same element type, e.g., int_u8 -> int or vec<3,f> -> rgb8. # include <vector> # include <algorithm>

15 years, 10 months

milena r3350: Fix minor bug in labeling canvas..

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-02-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix minor bug in labeling canvas.. * mln/canvas/labeling.hh: Bug fix. --- labeling.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/milena/mln/canvas/labeling.hh =================================================================== --- trunk/milena/mln/canvas/labeling.hh (revision 3349) +++ trunk/milena/mln/canvas/labeling.hh (revision 3350) @@ -470,7 +470,7 @@ const Image& input, const Neighborhood<N>& nbh, L& nlabels, F& functor) { - return impl::generic::labeling(input, nbh, input.domain(), nlabels, + return impl::generic::labeling(input, nbh, nlabels, exact(input).domain(), functor); }

15 years, 10 months

r3349: Fix IGR test file for segmentation (2D & 3D)

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix IGR test file for segmentation (2D & 3D). * fabien/igr/igr.cc: Fix segmentation bugs. --- igr.cc | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 16 deletions(-) Index: trunk/milena/sandbox/fabien/igr/igr.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/igr.cc (revision 3348) +++ trunk/milena/sandbox/fabien/igr/igr.cc (revision 3349) @@ -39,18 +39,25 @@ #include <mln/io/pbm/all.hh> #include <mln/io/ppm/all.hh> #include <mln/io/cloud/all.hh> +#include <mln/io/dump/all.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/neighb3d.hh> #include <mln/labeling/flat_zones.hh> +#include <mln/labeling/background.hh> #include <mln/literal/colors.hh> #include <mln/norm/l1.hh> -#include <mln/io/dump/all.hh> +#include <mln/geom/bbox.hh> #include <mln/labeling/blobs.hh> #include <mln/labeling/compute.hh> + #include <mln/level/compare.hh> +#include <mln/level/transform.hh> + +#include <mln/fun/internal/selector.hh> + #include <mln/fun/v2b/threshold.hh> #include <mln/level/transform.hh> #include <mln/accu/count.hh> @@ -66,15 +73,32 @@ #include <iostream> #include <mln/debug/println.hh> +using namespace mln; +using value::int_u8; +using value::rgb8; +using value::label_16; + + +template <typename T> +struct L_to_int_u8 +: mln::fun::internal::selector_<int_u8, T, L_to_int_u8<T> >::ret +{ + typedef int_u8 result; + int_u8 operator()(const T& t) const; +}; + +template <typename T> +inline +int_u8 +L_to_int_u8<T>::operator()(const T& t) const +{ + return static_cast<int_u8>(t == 0 ? 0 : 1 + ((unsigned) t - 1) % 255); +} template <typename I, typename N, typename L> mln_ch_value(I, mln::value::rgb8) igr(const mln::Image& input_, const mln::Neighborhood<N>& nbh_, L& nlabels) { - using namespace mln; - using value::int_u8; - using value::rgb8; - const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -93,6 +117,11 @@ mln_ch_value(I, bool) big_second; 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; @@ -125,9 +154,28 @@ 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); + + // Fill holes. - data::fill((big_second | pw::value(labels) == big_second_lbl).rw(), true); +// 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. @@ -141,7 +189,7 @@ accu::center<mln_site(I)> center_; mln_site(I) center = set::compute(center_, big_third.domain()); - result(center) = literal::red; + result(center) = literal::blue; // Distance. @@ -159,7 +207,6 @@ // Save the cloud in a file. - std::cout << "Nbr sites = " << arr.nsites() << std::endl; io::cloud::save(arr, "cloud.txt"); return result; @@ -167,19 +214,15 @@ int main() { - using namespace mln; - using value::int_u8; - using value::label_16; - trace::quiet = false; -// image2d<int_u8> src; -// io::pgm::load(src, "img/slice_7.pgm"); + image2d<int_u8> src; + io::pgm::load(src, "img/slice_7.pgm"); image3d<int_u8> vol; io::dump::load(vol, "img/IRM.dump"); label_16 nlabels; -// io::ppm::save(igr(src, c4(), nlabels), "out.ppm"); - io::dump::save(igr(vol, c6(), nlabels), "out.raw"); + //io::ppm::save(igr(src, c4(), nlabels), "slice_out.ppm"); + io::dump::save(igr(vol, c6(), nlabels), "vol_out.dump"); }

15 years, 10 months

3347: Add labeling::mean_values.

by Guillaume Lazzara

* mln/labeling/mean_values.hh: New. Create an image with the component mean values. --- milena/ChangeLog | 7 ++ milena/mln/labeling/mean_values.hh | 190 ++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 0 deletions(-) create mode 100644 milena/mln/labeling/mean_values.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fb64ae9..92e7c44 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add labeling::mean_values. + + * mln/labeling/mean_values.hh: New. Create an image with the component + mean values. + +2009-02-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. * mln/convert/from_to.hxx diff --git a/milena/mln/labeling/mean_values.hh b/milena/mln/labeling/mean_values.hh new file mode 100644 index 0000000..d7c131a --- /dev/null +++ b/milena/mln/labeling/mean_values.hh @@ -0,0 +1,190 @@ +// 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_LABELING_MEAN_VALUES_HH +# define MLN_LABELING_MEAN_VALUES_HH + +# include <mln/core/concept/image.hh> + +/// \file mln/labeling/mean_values.hh +/// +/// Construct from a labeled image a new image, the labels values are +/// replaced by the components mean values. + + +namespace mln +{ + + // Forward declaration + namespace value + { + template <unsigned n> struct rgb; + } + + + namespace labeling + { + + template <typename I, typename L> + mln_concrete(I) + mean_colors(const Image& input, + const Image<L>& lbl, mln_value(L) nlabels); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename I, typename L> + void + mean_values_tests(const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + { + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(lbl).is_valid()); + (void) input; + (void) lbl; + (void) nlabels; + } + + } // end of namespace mln::labeling::internal + + + namespace impl + { + + namespace generic + { + + template <typename I, typename L> + mln_concrete(I) + mean_values(const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + { + internal::mean_values_tests(input, lbl, nlabels); + + trace::warning("labeling::impl::generic::mean_values() is not \ + implemented!"); + //FIXME: to write! + abort(); + } + + } + + template <typename I, typename L> + mln_concrete(I) + mean_values_rgb(const Image& input_, + const Image<L>& lbl_, mln_value(L) nlabels) + { + trace::entering("mln::labeling::mean_values_rgb"); + + internal::mean_values_tests(input_, lbl_, nlabels); + + const I& input = exact(input_); + const L& lbl = exact(lbl_); + + util::array<vec3d_f> m_3f = labeling::compute(accu::mean<mln_value(I)>(), + input, // input color image + lbl, // watershed labeling + nlabels); + m_3f[0] = literal::zero; + + util::array<mln_value(I)> m; + convert::from_to(m_3f, m); + m[0] = literal::white; //FIXME: handle label 0 correctly. + + mln_concrete(I) output = level::transform(lbl, + convert::to< fun::i2v::array<mln_value(I)> >(m)); + + + trace::exiting("mln::labeling::mean_values_rgb"); + return output; + } + + } // end of namespace mln::morpho::impl + + + namespace internal + { + + template <unsigned n, typename I, typename L> + mln_concrete(I) + mean_values_dispatch(const value::rgb<n>&, + const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + { + return impl::mean_values_rgb(input, lbl, nlabels); + } + + template <typename I, typename L> + mln_concrete(I) + mean_values_dispatch(const mln_value(I)&, + const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + { + return impl::generic::mean_values(input, lbl, nlabels); + } + + template <typename I, typename L> + mln_concrete(I) + mean_values_dispatch(const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + { + return mean_values_dispatch(mln_value(I)(), input, lbl, nlabels); + } + + } // end of namespace mln::morpho::internal + + + + // Facade + + template <typename I, typename L> + mln_concrete(I) + mean_values(const Image& input, + const Image<L>& lbl, mln_value(L) nlabels) + + { + trace::entering("mln::labeling::mean_values"); + + internal::mean_values_tests(input, lbl, nlabels); + + mln_concrete(I) output = internal::mean_values_dispatch(input, lbl, nlabels); + + trace::exiting("mln::labeling::mean_values"); + return output; + } + + +# endif // !MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + +#endif // ! MLN_LABELING_MEAN_VALUES_HH -- 1.5.6.5

15 years, 10 months

3346: Add code to merge components thanks to a graph.

by Guillaume Lazzara

* lazzara/irm/wst_rag.cc: New. Related to IGR. --- milena/sandbox/ChangeLog | 6 + milena/sandbox/lazzara/irm/wst_rag.cc | 307 +++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/lazzara/irm/wst_rag.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index a223445..0fbfa8b 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,9 @@ +2009-02-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add code to merge components thanks to a graph. + + * lazzara/irm/wst_rag.cc: New. Related to IGR. + 2009-02-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> Make leveling filter and mean accumulator clean. diff --git a/milena/sandbox/lazzara/irm/wst_rag.cc b/milena/sandbox/lazzara/irm/wst_rag.cc new file mode 100644 index 0000000..3aa0935 --- /dev/null +++ b/milena/sandbox/lazzara/irm/wst_rag.cc @@ -0,0 +1,307 @@ +#include <mln/essential/2d.hh> +#include <mln/core/alias/vec3d.hh> +#include <mln/debug/draw_graph.hh> +#include <mln/util/graph.hh> +#include <mln/accu/center.hh> +#include <mln/io/dump/all.hh> +#include <mln/value/label_16.hh> +#include <mln/value/label_8.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/rgb16.hh> +#include <mln/accu/compute.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/draw/box.hh> +#include <mln/level/stretch.hh> +#include <mln/canvas/morpho/algebraic_union_find.hh> +#include <mln/fun/v2v/id.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/labeling/mean_values.hh> + +#include <mln/extract/all.hh> + +namespace mln +{ + + + template <typename I, typename N> + util::graph + make_graph(const I& w, const N& nbh, const mln_value(I)& nbasins) + { + + image2d<bool> adj(box2d(nbasins.next(), nbasins.next())); + data::fill(adj, false); + + typedef mln_value(I) L; + L l1, l2; + mln_piter(I) p(w.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + if (w(p) != 0u) + continue; + // p is in the watershed line. + l1 = l2 = 0; + for_all(n) + if (w.has(n) && w(n) != 0u) + { + if (l1 == 0u) // First label to be stored. + l1 = w(n); + else + if (w(n) != l1) // Useless: && l2 == 0) + { // Second label to be stored. + mln_invariant(l2 == 0u); + l2 = w(n); + break; + } + } + if (l2 == 0u || l1 == 0u) + continue; + if (l2 < l1) + std::swap(l1, l2); + + // adjacency l1 l2 + adj(point2d(l1,l2)) = true; + adj(point2d(l2,l1)) = true; + } + + // Construct graph. + util::graph g; + g.add_vertices(nbasins.next()); + for (unsigned i = 1; i < geom::nrows(adj); ++i) + for (unsigned j = 1; j < i; ++j) + if (adj(point2d(i,j))) + g.add_edge(i, j); + + return g; + } + + + + + template <typename V> + value::int_u8 dist(const V& c1, const V& c2) + { + unsigned d = 0; + d += (math::diff_abs(c1.red(), c2.red()) + 2) / 3; + d += (math::diff_abs(c1.green(), c2.green()) + 2) / 3; + d += (math::diff_abs(c1.blue(), c2.blue()) + 2) / 3; + if (d > 255) + d = 255; + return d; + } + + + template <typename I> + inline + pw::image<fun::i2v::array<value::int_u8>, p_edges<util::graph, fun::i2v::array<mln_site(I)> > > + make_edge_graph_image(const I& ima_v, const util::graph& g) // image on graph vertices; value = mean color per vertex (watershed basin) + { + + // edge sites. + typedef fun::i2v::array<mln_site(I)> edge_site_t; + edge_site_t edge_site(g.e_nmax(), literal::origin); + typedef p_edges<util::graph, edge_site_t > pe_t; + pe_t pe(g, edge_site); + + // edge values + typedef fun::i2v::array<value::int_u8> edge_values_t; + edge_values_t edge_values(g.e_nmax()); + + // image on graph edges + typedef pw::image<edge_values_t, pe_t> ima_e_t; + ima_e_t ima_e = (edge_values | pe); + + mln_piter(ima_e_t) e(ima_e.domain()); + for_all(e) // in ima_e + ima_e(e) = dist(ima_v.function()(e.element().v1()), + ima_v.function()(e.element().v2())); + + return ima_e; + } + + + template <typename I, typename J> + inline + util::array<mln_value(I)> + mean_color_values(const I& input, const J& w, mln_value(J) nbasins) + { + // Cf. sandbox/theo/color/segment_rgb_pixels.cc + + util::array<vec3d_f> m_3f = labeling::compute(accu::mean<mln_value(I)>(), + input, // input color image + w, // watershed labeling + nbasins); + m_3f[0] = literal::zero; + + util::array<mln_value(I)> m; + convert::from_to(m_3f, m); + m[0] = literal::yellow; + + io::ppm::save(level::transform(w, + convert::to< fun::i2v::array<mln_value(I)> >(m)), + "wst_rag_wshd_color.ppm"); + + return m; + } + + template <typename I, typename J> + pw::image<fun::i2v::array<mln_value(I)>, p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > + make_vertex_graph_image(const util::graph& g, const I&input, + const J& w, const mln_value(J)& nbasins) + { + typedef util::array<mln_site(I)> vertex_sites_t; + vertex_sites_t site_values; + convert::from_to(labeling::compute(accu::center<mln_site(I)>(), w, nbasins), site_values); + + typedef fun::i2v::array<mln_site(J)> f_sites_t; + f_sites_t sites; + convert::from_to(site_values, sites); + + // p_vertices + typedef p_vertices<util::graph, f_sites_t> S; + S pv(g, sites); + + + typedef fun::i2v::array<mln_value(I)> vertex_values_t; + vertex_values_t vertex_values; + convert::from_to(mean_color_values(input, w, nbasins), vertex_values); + + mln_VAR(ima_v, (vertex_values | pv)); + + return ima_v; + } + + + template <typename I, typename V> + struct edge_to_color : Function_p2v< edge_to_color<I,V> > + { + typedef V result; + + edge_to_color(const I& ima) + : ima_(ima) + { + } + + V + operator()(const unsigned& e) const + { + return convert::to<V>(ima_.function()(e)); + } + + const I& ima_; + }; + + template <typename V> + inline + unsigned + find_root(util::array<V>& parent, const unsigned& x) + { + if (parent[x] == x) + return x; + else + return parent[x] = find_root(parent, parent[x]); + } + + + template <typename I, typename V, typename E> + inline + image2d<mln_value(I)> + make_debug_graph_image(const I& input, const V& ima_v, const E& ima_e, unsigned box_size) + { + image2d<mln_value(I)> ima; + initialize(ima, input); + + data::fill(ima, literal::white); + debug::draw_graph(ima, ima_v.domain(), + pw::cst(mln_value(I)(literal::green)), + edge_to_color<E, mln_value(I)>(ima_e)); + + dpoint2d tl(-box_size,-box_size); + dpoint2d br(box_size,box_size); + mln_piter(V) p(ima_v.domain()); + for_all(p) + { + box2d b(p + tl, p + br); + b.crop_wrt(ima.domain()); + data::fill((ima | b).rw(), convert::to<mln_value(I)>(ima_v(p))); + } + + return ima; + } + +} + + +int main(int, char *argv[]) +{ + using namespace mln; + + using value::int_u16; + using value::int_u8; + using value::label_16; + using value::label_8; + using value::rgb16; + using value::rgb8; + + typedef image2d<rgb8> I; + typedef image2d<label_16> J; + + unsigned box_size = atoi(argv[3]); + + I input; + io::ppm::load(input, argv[1]); +// image2d<rgb16> input = level::convert(rgb16(), input_); + + J vol; + io::dump::load(vol, argv[2]); + + label_16 nbasins = 898; + std::cout << "nbasins = " << nbasins << std::endl; + + util::graph g = make_graph(vol, c4(), nbasins); + + mln_VAR(ima_v, make_vertex_graph_image(g, input, vol, nbasins)); + mln_VAR(ima_e, make_edge_graph_image(ima_v, g)); + + //DEBUG +// io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size), "wst_rag_graph_image.ppm"); + + + mln_piter_(ima_e_t) e(ima_e.domain()); + util::array<label_16> parent(g.v_nmax()); + for (unsigned i = 0; i < parent.nelements(); ++i) + parent[i] = i; + + for_all(e) + { + unsigned v1 = e.element().v1(); + unsigned v2 = e.element().v2(); + if (ima_e(e) <= (unsigned)(atoi(argv[4])) + && find_root(parent, v1) != find_root(parent, v2)) + parent[find_root(parent, v1)] = find_root(parent, v2); + } + + fun::i2v::array<label_16> f(parent.nelements()); + std::vector<unsigned> new_label(parent.nelements(), 0); + unsigned nbasins2 = 0; + for (unsigned i = 0; i < parent.nelements(); ++i) + { + unsigned p = find_root(parent, i); + if (new_label[p] == 0) + new_label[p] = nbasins2++; + f(i) = new_label[p]; + } + mln_invariant(f(0) == 0); + --nbasins2; //nbasins2 does not count the basin with label 0. + std::cout << "nbasins2 = " << nbasins2 << std::endl; + + J vol2 = level::transform(vol, f); + util::graph g2 = make_graph(vol2, c4(), nbasins2); + mln_VAR(ima_v2, make_vertex_graph_image(g2, input, vol2, nbasins2)); + mln_VAR(ima_e2, make_edge_graph_image(ima_v2, g2)); + + J vol2_ = morpho::elementary::dilation(vol2, c4()); + io::ppm::save(labeling::mean_values(input, vol2_, nbasins2), "wst_rag_mean_colors.ppm"); + io::ppm::save(make_debug_graph_image(input, ima_v2, ima_e2, box_size), "wst_rag_graph_image2.ppm"); +} -- 1.5.6.5

15 years, 10 months

3345: Various small fixes.

by Guillaume Lazzara

* mln/convert/from_to.hxx * mln/value/label.hh: add a missing from_to(int_u, label). * mln/core/alias/neighb3d.hh: add c4_3d(). * mln/core/concept/function.hh * mln/labeling/regional_maxima.hh * mln/labeling/regional_minima.hh: fix warnings. * mln/util/timer.hh: fix unit test. * mln/value/rgb.hh: remove a useless exact(). --- milena/ChangeLog | 17 +++++++++++++ milena/mln/convert/from_to.hxx | 5 ++++ milena/mln/core/alias/neighb3d.hh | 33 +++++++++++++++++++++++++ milena/mln/core/concept/function.hh | 3 +- milena/mln/labeling/regional_maxima.hh | 6 +++- milena/mln/labeling/regional_minima.hh | 2 +- milena/mln/util/timer.hh | 2 +- milena/mln/value/label.hh | 42 ++++++++++++++++++++++++++++++++ milena/mln/value/rgb.hh | 3 +- 9 files changed, 106 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6222bdb..fb64ae9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2009-02-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Various small fixes. + + * mln/convert/from_to.hxx + * mln/value/label.hh: add a missing from_to(int_u, label). + + * mln/core/alias/neighb3d.hh: add c4_3d(). + + * mln/core/concept/function.hh + * mln/labeling/regional_maxima.hh + * mln/labeling/regional_minima.hh: fix warnings. + + * mln/util/timer.hh: fix unit test. + + * mln/value/rgb.hh: remove a useless exact(). + 2009-02-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho algebraic closing. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 160acaa..4649932 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -84,6 +84,7 @@ namespace mln template <unsigned n> struct rgb; template <typename H, typename S, typename L> class hsl_; template <unsigned n> struct int_u; + template <unsigned n> struct label; } // end of Forward declarations. @@ -155,6 +156,10 @@ namespace mln template <unsigned m> void from_to_(const value::int_u<m>& from, value::rgb<m>& to); + // int_u -> label + template <unsigned n> + void from_to_(const value::int_u<n>& from, value::label<n>& to_); + // hsl -> rgb8. template <typename H, typename S, typename L> void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); diff --git a/milena/mln/core/alias/neighb3d.hh b/milena/mln/core/alias/neighb3d.hh index c023172..59d72bb 100644 --- a/milena/mln/core/alias/neighb3d.hh +++ b/milena/mln/core/alias/neighb3d.hh @@ -50,6 +50,23 @@ namespace mln */ typedef neighb<window3d> neighb3d; + /// 4-connectivity neighborhood on the 3D grid. + /// + /// . . . + /// . . . + /// . . . + /// + /// . o . + /// o x o + /// . o . + /// + /// . . . + /// . . . + /// . . . + /// + /// \return A neighb3d. + /// + const neighb3d& c4_3d(); /*! \brief 6-connectivity neighborhood on the 3D grid. * @@ -126,6 +143,22 @@ namespace mln # ifndef MLN_INCLUDE_ONLY inline + const neighb3d& c4_3d() + { + static neighb3d it; + if (it.size() == 0) + { + window3d& win = it.hook_win_(); + win + .insert(0, 1, 0) + .insert(0, 0, 1); + win + .insert(win::sym(win)); + } + return it; + } + + inline const neighb3d& c6() { static neighb3d it; diff --git a/milena/mln/core/concept/function.hh b/milena/mln/core/concept/function.hh index 8aada68..2d8baff 100644 --- a/milena/mln/core/concept/function.hh +++ b/milena/mln/core/concept/function.hh @@ -537,7 +537,8 @@ namespace mln template <typename E> inline Function_p2p<E>::Function_p2p(const Function_p2p<E>& rhs) - : Function_p2v<E>(rhs) + : Function_v2v<E>(rhs), + Function_p2v<E>(rhs) { } diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index 595b6ce..37ac428 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -87,7 +87,7 @@ namespace mln input(p); } void do_no_union(const P& n, const P& p) { mln_invariant(input(n) > input(p)); - attr(p) = false; } + attr(p) = false; (void)n; } void init_attr(const P&) {} void merge_attr(const P& r, const P& p) { attr(p) = attr(p) && attr(r); } @@ -101,7 +101,9 @@ namespace mln input.element(p); } void do_no_union_(unsigned n, unsigned p) { mln_invariant(input.element(n) > input.element(p)); - attr.element(p) = false; } + attr.element(p) = false; + (void) n; + } void init_attr_(unsigned) {} void merge_attr_(unsigned r, unsigned p) { attr.element(p) = attr.element(p) && attr.element(r); } diff --git a/milena/mln/labeling/regional_minima.hh b/milena/mln/labeling/regional_minima.hh index a70f1c7..a804cad 100644 --- a/milena/mln/labeling/regional_minima.hh +++ b/milena/mln/labeling/regional_minima.hh @@ -101,7 +101,7 @@ namespace mln // Fastest implementation void init_() { data::fill(attr, true); } - bool handles_(unsigned p) const { return true; } + bool handles_(unsigned) const { return true; } bool labels_(unsigned p) const { return attr.element(p); } bool equiv_(unsigned n, unsigned p) const { return input.element(n) == input.element(p); } diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 49b0b2e..6ef3256 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -44,7 +44,7 @@ namespace mln /// Timer structure. class timer : public Proxy< timer >, - public internal::proxy_impl<float, timer> + public mln::internal::proxy_impl<float, timer> { public: diff --git a/milena/mln/value/label.hh b/milena/mln/value/label.hh index 4a97a5c..3aa473b 100644 --- a/milena/mln/value/label.hh +++ b/milena/mln/value/label.hh @@ -81,6 +81,20 @@ namespace mln } // end of namespace trait + namespace convert + { + + namespace over_load + { + + // int_u -> label. + template <unsigned n> + void + from_to_(const value::int_u<n>& from, value::label<n>& to_); + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert namespace value { @@ -148,8 +162,36 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const label<n>& l); + } // end of namespace mln::value + + # ifndef MLN_INCLUDE_ONLY + + namespace convert + { + + namespace over_load + { + + // int_u -> label. + template <unsigned n> + inline + void + from_to_(const value::int_u<n>& from, value::label<n>& to_) + { + to_ = from; + } + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + + + + namespace value + { + template <unsigned n> inline label<n>::label() diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 6b2a479..9c64936 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -723,9 +723,8 @@ namespace mln template <typename T, unsigned m> inline void - from_to_(const algebra::vec<3,T>& from, value::rgb<m>& to_) + from_to_(const algebra::vec<3,T>& from, value::rgb<m>& to) { - value::rgb<m>& to = exact(to_); algebra::vec<3, unsigned> tmp; for (unsigned i = 0; i < 3; ++i) tmp[i] = static_cast<unsigned>(from[i]); // FIXME: Use from_to_ instead of cast. -- 1.5.6.5

15 years, 10 months

3344: Add morpho algebraic closing.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho algebraic closing. * mln/morpho/attribute/volume.hh: New. * mln/morpho/closing_algebraic.hh: Copy to... * mln/morpho/opening_algebraic.hh: ...this new file. Make it a closing. * mln/canvas/morpho/algebraic_filter.hh (todo): New. * tests/morpho/closing_volume.cc: Test that the new version with morpho::attribute::volume gives the same result as the former version. mln/canvas/morpho/algebraic_filter.hh | 2 mln/morpho/attribute/volume.hh | 172 +++++++++++++++++----------------- mln/morpho/opening_algebraic.hh | 24 ++-- tests/morpho/closing_volume.cc | 16 ++- 4 files changed, 113 insertions(+), 101 deletions(-) Index: mln/morpho/attribute/volume.hh --- mln/morpho/attribute/volume.hh (revision 3334) +++ mln/morpho/attribute/volume.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// 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 @@ -26,33 +26,50 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_ACCU_VOLUME_HH -# define MLN_ACCU_VOLUME_HH +#ifndef MLN_MORPHO_ATTRIBUTE_VOLUME_HH +# define MLN_MORPHO_ATTRIBUTE_VOLUME_HH -/// \file mln/accu/volume.hh +/// \file mln/morpho/attribute/volume.hh +/// /// Define an accumulator that computes the volume of a -/// component through one of its pixels. -/*! - This accumulator uses an mln::util::pix (pixel) to update the - reference level, area and volume information of the component. - - The class mln/accu/volume is not a general-purpose accumulator; - it is used to implement volume-based connected filters. - \see mln::morpho::closing_volume - \see mln::morpho::opening_volume -*/ +/// component. # include <mln/accu/internal/base.hh> -# include <mln/core/concept/meta_accumulator.hh> # include <mln/math/diff_abs.hh> -# include <mln/util/pix.hh> -# include <mln/literal/zero.hh> namespace mln { - namespace accu + // Forward declaration. + namespace morpho { + namespace attribute { + template <typename I> class volume; + } + } + + + // Traits. + + namespace trait + { + + template <typename I> + struct accumulator_< morpho::attribute::volume > + { + 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_v when_pix; + }; + + } // end of namespace mln::trait + + + namespace morpho + { + + namespace attribute { /// Volume accumulator class. @@ -63,26 +80,20 @@ struct volume : public mln::accu::internal::base< unsigned , volume > { - /// The accumulated data type. - /// - /// The volume of component is represented by the volume of its - /// root pixel. See mln::morpho::closing_volume and - /// mln::morpho::opening_volume for actual uses of this - /// accumulator. - typedef util::pix argument; - /// The value type associated to the pixel type. - typedef typename argument::value value; + typedef mln_value(I) argument; volume(); /// Manipulators. /// \{ void init(); - void take(const argument& pixel); + + void take(const mln_value(I)& v); + void take(const util::pix& px); void take(const volume& other); - /// Force the value of the counter to \a v. - void set_value(unsigned v); + void take_as_init(const mln_value(I)& v); + void take_as_init(const util::pix& px); /// \} /// Get the value of the accumulator. @@ -93,31 +104,15 @@ bool is_valid() const; protected: - /// The reference level (the level of the component's root). - value ref_level__; + /// The current level. + mln_value(I) level_; /// The area of the component. - unsigned area__; + unsigned area_; /// The volume of the component. unsigned volume_; }; - namespace meta - { - - /// Meta accumulator for volume. - - struct volume : public Meta_Accumulator< volume > - { - template <typename I> - struct with - { - typedef accu::volume ret; - }; - }; - - } // end of namespace mln::accu::meta - # ifndef MLN_INCLUDE_ONLY @@ -133,32 +128,32 @@ void volume::init() { - ref_level__ = literal::zero; volume_ = 0; - area__ = 0; } template <typename I> inline void - volume::take(const argument& pixel) + volume::take(const mln_value(I)& v) { - /* FIXME: Growing a component using this particular `take' - routine won't work, since the update does not take care of - the reference level to compute the new volume. Maybe we - could distinguish two cases: - - 1. the empty accumulator case (which corresponds to the - following code); - 2. the non-empty accumulator case (which sohuld act as in - `take(const volume& other)'). + mln_invariant(volume_ != mln_max(unsigned)); + if (! is_valid()) + { + take_as_init(v); + return; + } + ++area_; + volume_ += 1 + math::diff_abs(v, level_); + level_ = v; + } - Currently, the implementation is only valid if the - accumulator was initialy empty before the call to - `take(const argument&)'. */ - ref_level__ = pixel.v(); - ++area__; - ++volume_; + template <typename I> + inline + void + volume::take(const util::pix& px) + { + mln_invariant(volume_ != mln_max(unsigned)); + take(px.v()); } template <typename I> @@ -166,33 +161,38 @@ void volume::take(const volume& other) { - area__ += other.area__; - /* FIXME: Is it `t.area__' or `area__' ? Th�o said it was - the latter, but both the ISMM 2005 paper and Olena 0.11 use - the former. */ + mln_invariant(volume_ != mln_max(unsigned)); + area_ += other.area_; volume_ += other.volume_ + - other.area__ * math::diff_abs(other.ref_level__, ref_level__); - // Member ref_level__ is not touched. + other.area_ * math::diff_abs(other.level_, level_); + // level_ do not change. } template <typename I> inline - unsigned - volume::to_result() const + void + volume::take_as_init(const mln_value(I)& v) { - return volume_; + level_ = v; + area_ = 1; + volume_ = 1; } template <typename I> inline void - volume::set_value(unsigned v) + volume::take_as_init(const util::pix& px) + { + take_as_init(px.v()); + } + + template <typename I> + inline + unsigned + volume::to_result() const { - volume_ = v; - // Reset the other members. - ref_level__ = literal::zero; - area__ = 0; + return volume_; } template <typename I> @@ -200,14 +200,16 @@ bool volume::is_valid() const { - return true; + return volume_ != 0; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu + } // end of namespace mln::morpho::attribute + + } // end of namespace mln::morpho } // end of namespace mln -#endif // ! MLN_ACCU_VOLUME_HH +#endif // ! MLN_MORPHO_ATTRIBUTE_VOLUME_HH Property changes on: mln/morpho/attribute/volume.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/morpho/opening_algebraic.hh --- mln/morpho/opening_algebraic.hh (revision 3334) +++ mln/morpho/opening_algebraic.hh (working copy) @@ -26,12 +26,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_CLOSING_ALGEBRAIC_HH -# define MLN_MORPHO_CLOSING_ALGEBRAIC_HH +#ifndef MLN_MORPHO_OPENING_ALGEBRAIC_HH +# define MLN_MORPHO_OPENING_ALGEBRAIC_HH -/// \file mln/morpho/closing_algebraic.hh +/// \file mln/morpho/opening_algebraic.hh /// -/// Morphological algebraic closing. +/// Morphological algebraic opening. # include <mln/morpho/includes.hh> # include <mln/canvas/morpho/algebraic_filter.hh> @@ -43,10 +43,10 @@ namespace morpho { - /// Morphological algebraic closing. + /// Morphological algebraic opening. template <typename I, typename N, typename A> mln_concrete(I) - closing_algebraic(const Image& input, const Neighborhood<N>& nbh, + opening_algebraic(const Image& input, const Neighborhood<N>& nbh, const Accumulator<A>& accu, const mln_result(A)& lambda); @@ -58,20 +58,20 @@ template <typename I, typename N, typename A> inline mln_concrete(I) - closing_algebraic(const Image& input, const Neighborhood<N>& nbh, + opening_algebraic(const Image& input, const Neighborhood<N>& nbh, const Accumulator<A>& accu, const mln_result(A)& lambda) { - trace::entering("morpho::closing_algebraic"); + trace::entering("morpho::opening_algebraic"); mln_precondition(exact(input).is_valid()); mln_concrete(I) output; output = canvas::morpho::algebraic_filter(input, nbh, accu, lambda, - /* increasing = */ true); + /* increasing = */ false); - mln_postcondition(output >= input); + mln_postcondition(output <= input); - trace::exiting("morpho::closing_algebraic"); + trace::exiting("morpho::opening_algebraic"); return output; } @@ -83,4 +83,4 @@ } // end of namespace mln -#endif // ! MLN_MORPHO_CLOSING_ALGEBRAIC_HH +#endif // ! MLN_MORPHO_OPENING_ALGEBRAIC_HH Index: mln/canvas/morpho/algebraic_filter.hh --- mln/canvas/morpho/algebraic_filter.hh (revision 3343) +++ mln/canvas/morpho/algebraic_filter.hh (working copy) @@ -32,6 +32,8 @@ /// \file mln/canvas/morpho/algebraic_filter.hh /// /// Canvas for morphological algebraic filters. +/// +/// \todo Add a version without 'activity' thanx to set_value. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> Index: tests/morpho/closing_volume.cc --- tests/morpho/closing_volume.cc (revision 3343) +++ tests/morpho/closing_volume.cc (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// 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 @@ -38,15 +38,23 @@ #include <mln/io/pgm/save.hh> #include <mln/morpho/closing_volume.hh> +#include <mln/morpho/attribute/volume.hh> #include "tests/data.hh" + int main() { using namespace mln; using value::int_u8; - image2d<int_u8> lena; + typedef image2d<int_u8> I; + I lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - io::pgm::save(morpho::closing_volume(lena, c4(), 10000), "out.pgm"); + io::pgm::save(morpho::closing_volume(lena, c4(), 10000), + "ref.pgm"); + + typedef morpho::attribute::volume A; + io::pgm::save(morpho::closing_attribute<A>(lena, c4(), 10000), + "out.pgm"); }

15 years, 10 months

scool r133: Fix a bug in function and method translations

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r133: Fix a bug in function and method translations URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-11 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix a bug in function and method translations. * scoolt/Class.str: Do not delete the dynamic rule just after its creation. * scoolt/Function.str: Handle verbatim C++ statements inside functions. --- Class.str | 2 +- Function.str | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 132) +++ branches/scool-ng/src/scoolt/Class.str (revision 133) @@ -131,4 +131,4 @@ InClass = rules(IsInClass:- _) ; rules(IsInClass: _ -> 1) - OutClass = rules(IsInClass: _ -> 0) ; rules(IsInClass:- _) + OutClass = rules(IsInClass:- _) ; rules(IsInClass: _ -> 0) Index: branches/scool-ng/src/scoolt/Function.str =================================================================== --- branches/scool-ng/src/scoolt/Function.str (revision 132) +++ branches/scool-ng/src/scoolt/Function.str (revision 133) @@ -106,6 +106,11 @@ <ExpressionToCxx> exp => cxx_exp FunctionStatementToCxx: + CxxStatement(exp) -> cxx_exp + where + <ExpressionToCxx> exp => cxx_exp + + FunctionStatementToCxx: exp -> [CxxExpStm(CxxKeyword("return", cxx_exp))] where <ExpressionToCxx> exp => cxx_exp

15 years, 10 months

scool r132: Fix an ambiguity with verbatim c++ statements

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r132: Fix an ambiguity with verbatim c++ statements URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-11 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix an ambiguity with verbatim c++ statements. * scl-syn/Statement.sdf: Prefer CxxStatement for verbatim C++ statements. --- Statement.sdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: branches/scool-ng/src/scl-syn/Statement.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Statement.sdf (revision 131) +++ branches/scool-ng/src/scl-syn/Statement.sdf (revision 132) @@ -12,7 +12,7 @@ CxxStatement -> Statement CxxStatement -> FunctionStatement - Cxx ";" -> CxxStatement {cons("CxxStatement")} + Cxx ";" -> CxxStatement {cons("CxxStatement"),prefer} Expression ";" -> FunctionStatement {cons("ExpressionStatement")} SimpleDeclaration -> FunctionStatement "->" Expression ";" -> FunctionStatement {cons("ReturnStatement")}

15 years, 10 months

scool r131: Update tests and add those used in van-noppen.09.dslwc

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r131: Update tests and add those used in van-noppen.09.dslwc URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-11 Maxime van Noppen <yabo(a)lrde.epita.fr> Update tests and add those used in van-noppen.09.dslwc. * concept/scool_src/concept_1.scl, * concept/scool_src/concept_2.scl, * concept/scool_src/concept_3.scl, * concept/scool_src/concept_4.scl, * concept/scool_src/concept_use_1.scl, * concept/scool_src/concept_use_2.scl: Here. * concept/scool_src/concept_use_3.scl: New. * examples/c++_ast/animal_hierarchy.aterm: New. * examples/c++_ast/point1d_simple.aterm: Remove. * examples/c++_build/point1d_simple.g++: Remove. * examples/c++_src/animal_hierarchy.cc: New. * examples/c++_src/point1d_simple.cc: Remove. * examples/scool_ast/animal_hierarchy.aterm: New. * examples/scool_ast/point1d_simple.aterm: Remove. * examples/scool_ast/sample_animal_hierarchy.aterm: Remove. * examples/scool_src/animal_hierarchy.scl: New. * examples/scool_src/container_1.scl: New. * examples/scool_src/container_2.scl: New. * examples/scool_src/embeded_c++.scl: New. * examples/scool_src/fact.scl: New. * examples/scool_src/meta_identity.scl: New. * examples/scool_src/meta_type_equality.scl: New. * examples/scool_src/point1d.scl: New. * examples/scool_src/point1d_simple.scl: Remove. * examples/scool_src/sample_animal_hierarchy.scl: Remove. * examples/scool_src/sample_container.scl: Remove. --- branches/scool-ng/tests/concept/scool_src/concept_1.scl | 2 branches/scool-ng/tests/concept/scool_src/concept_2.scl | 2 branches/scool-ng/tests/concept/scool_src/concept_3.scl | 4 branches/scool-ng/tests/concept/scool_src/concept_4.scl | 6 - branches/scool-ng/tests/concept/scool_src/concept_use_1.scl | 2 branches/scool-ng/tests/concept/scool_src/concept_use_2.scl | 2 branches/scool-ng/tests/concept/scool_src/concept_use_3.scl | 30 +++++++ branches/scool-ng/tests/examples/c++_ast/animal_hierarchy.aterm | 1 branches/scool-ng/tests/examples/c++_src/animal_hierarchy.cc | 28 ++++++ branches/scool-ng/tests/examples/scool_ast/animal_hierarchy.aterm | 1 branches/scool-ng/tests/examples/scool_src/animal_hierarchy.scl | 41 ++++++++++ branches/scool-ng/tests/examples/scool_src/container_1.scl | 16 +++ branches/scool-ng/tests/examples/scool_src/container_2.scl | 28 ++++++ branches/scool-ng/tests/examples/scool_src/embeded_c++.scl | 8 + branches/scool-ng/tests/examples/scool_src/fact.scl | 7 + branches/scool-ng/tests/examples/scool_src/meta_identity.scl | 4 branches/scool-ng/tests/examples/scool_src/meta_type_equality.scl | 17 ++++ branches/scool-ng/tests/examples/scool_src/point1d.scl | 18 ++++ 18 files changed, 208 insertions(+), 9 deletions(-) Index: branches/scool-ng/tests/concept/scool_src/concept_use_1.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_use_1.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_use_1.scl (revision 131) @@ -2,7 +2,7 @@ { value : type; - decl get_value : () -> value; + get_value : () -> value; } foo : [ T : type where (T models box) ] (pbox : T) -> void = Index: branches/scool-ng/tests/concept/scool_src/concept_use_2.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_use_2.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_use_2.scl (revision 131) @@ -2,7 +2,7 @@ { value : type; - decl get_value : () -> value; + get_value : () -> value; } foo : [ T : type where T models box ] (pbox : T) -> void = Index: branches/scool-ng/tests/concept/scool_src/concept_use_3.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_use_3.scl (revision 0) +++ branches/scool-ng/tests/concept/scool_src/concept_use_3.scl (revision 131) @@ -0,0 +1,30 @@ +// Example found in van-noppen.09.dslwc + +// Concept declaration +Box : concept = +{ + value_type : type; + get_value : () -> value_type; + mutable set_value : (value : value_type) -> void; +} + +// Declaration of a class modeling this concept +Element : class models Box = +{ + public + { + value_type : type = int; + get_value : () -> value_type = { -> value_; } + mutable set_value : (value : value_type) -> void = { value_ = value; } + } + private + { + value_ : value_type; + } +} + +// Usage of the concept to restrain a static parameter +f : [ T : type where T models Box] (val : T) -> void = +{ + point : T::value_type = val.get_value(); +} Index: branches/scool-ng/tests/concept/scool_src/concept_1.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_1.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_1.scl (revision 131) @@ -2,5 +2,5 @@ { value : type; - decl get_value : () -> value; + get_value : () -> value; } Index: branches/scool-ng/tests/concept/scool_src/concept_2.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_2.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_2.scl (revision 131) @@ -2,5 +2,5 @@ { value : type; - decl set_value : (val : value) -> value; + mutable set_value : (val : value) -> value; } Index: branches/scool-ng/tests/concept/scool_src/concept_3.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_3.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_3.scl (revision 131) @@ -2,6 +2,6 @@ { value : type; - decl set_value : (val : value) -> value; - decl get_value : () -> value; + mutable set_value : (val : value) -> value; + get_value : () -> value; } Index: branches/scool-ng/tests/concept/scool_src/concept_4.scl =================================================================== --- branches/scool-ng/tests/concept/scool_src/concept_4.scl (revision 130) +++ branches/scool-ng/tests/concept/scool_src/concept_4.scl (revision 131) @@ -2,7 +2,7 @@ { value : type; - decl set_value : (val : value) -> value; - decl get_value : () -> value; - decl print_value : () -> void; + mutable set_value : (val : value) -> value; + get_value : () -> value; + print_value : () -> void; } Index: branches/scool-ng/tests/examples/c++_ast/point1d_simple.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/examples/c++_ast/animal_hierarchy.aterm =================================================================== --- branches/scool-ng/tests/examples/c++_ast/animal_hierarchy.aterm (revision 0) +++ branches/scool-ng/tests/examples/c++_ast/animal_hierarchy.aterm (revision 131) @@ -0,0 +1 @@ +CxxProgram([CxxProgram("#include <iostream>"),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[CxxPublic([CxxFun([],CxxType("void"),CxxId("scream"),Const,[])])]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),[("public",CxxType(CxxId("Animal"),[CxxId("Exact")]))],[CxxPublic([CxxFun([],CxxType("void"),CxxId("scream"),[],Const,[CxxProgram("std::cout << \"Meow!\" << std::endl; ")])])]),CxxClassDecl([],CxxId("Dog"),[("public",CxxType(CxxId("Animal"),[CxxId("Dog")]))],[CxxPublic([CxxFun([],CxxType("void"),CxxId("scream"),[],Const,[CxxProgram("std::cout << \"Woof!\" << std::endl; ")])])]),CxxFun([],CxxType("void"),CxxId("scream"),[(CxxConstType(CxxRefType(CxxType("Animal"))),CxxId("animal"))],None,[CxxProgram("std::cout << animal.scream(); << std::endl; ")])]) Index: branches/scool-ng/tests/examples/c++_src/point1d_simple.cc (deleted) =================================================================== Index: branches/scool-ng/tests/examples/c++_src/animal_hierarchy.cc =================================================================== --- branches/scool-ng/tests/examples/c++_src/animal_hierarchy.cc (revision 0) +++ branches/scool-ng/tests/examples/c++_src/animal_hierarchy.cc (revision 131) @@ -0,0 +1,28 @@ +#include <iostream> +template < typename Exact > +class Animal +{ + public: + void scream() const; +}; +template < typename Exact > +class Cat : public Animal< Exact > +{ + public: + void scream() const + { + std::cout << "Meow!" << std::endl; + } +}; +class Dog : public Animal< Dog > +{ + public: + void scream() const + { + std::cout << "Woof!" << std::endl; + } +}; +void scream(const Animal& animal) +{ + std::cout << animal.scream(); << std::endl; +} Index: branches/scool-ng/tests/examples/scool_ast/sample_animal_hierarchy.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/examples/scool_ast/point1d_simple.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/examples/scool_ast/animal_hierarchy.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/animal_hierarchy.aterm (revision 0) +++ branches/scool-ng/tests/examples/scool_ast/animal_hierarchy.aterm (revision 131) @@ -0,0 +1 @@ +Program([CxxStatement(Cxx("#include <iostream>")),ClassDefinition(Identifier("Animal"),None,None,ClassBlock([AccessBlock(Public,[FunctionDeclaration(None,Identifier("scream"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")))])])),ClassDefinition(Identifier("Cat"),None,Some(ClassWhereClause([Inherits("Cat",SimpleType("Animal"))])),ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("scream"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([CxxStatement(Cxx("std::cout << \"Meow!\" << std::endl; "))]))])])),ClassDefinition(Identifier("Dog"),Some("final"),Some(ClassWhereClause([Inherits("Dog",SimpleType("Animal"))])),ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("scream"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([CxxStatement(Cxx("std::cout << \"Woof!\" << std::endl; "))]))])])),FunctionDefinition(None,Identifier("scream"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("animal"),SimpleType("Animal"))]),SimpleType("void")),FunctionBlock([CxxStatement(Cxx("std::cout << animal.scream(); << std::endl; "))]))]) Index: branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl (deleted) =================================================================== Index: branches/scool-ng/tests/examples/scool_src/sample_container.scl (deleted) =================================================================== Index: branches/scool-ng/tests/examples/scool_src/point1d_simple.scl (deleted) =================================================================== Index: branches/scool-ng/tests/examples/scool_src/animal_hierarchy.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/animal_hierarchy.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/animal_hierarchy.scl (revision 131) @@ -0,0 +1,41 @@ +|[#include <iostream>]|; + +Animal : class = +{ + public + { + scream : () -> void; + } +} +Cat : class where Cat -> Animal = +{ + public + { + scream : () -> void = { |[ std::cout << "Meow!" << std::endl; ]|; } + } +} + +Dog : final class where Dog -> Animal = +{ + public + { + scream : () -> void = { |[ std::cout << "Woof!" << std::endl; ]|; } + } +} + +scream : (animal : Animal) -> void = +{ + |[ std::cout << animal.scream(); << std::endl; ]|; +} + +/* +main : () -> int = +{ + var cat : Cat; + var dog : Dog; + + scream(cat); + scream(dog); + -> 0; +} +*/ Property changes on: branches/scool-ng/tests/examples/scool_src/animal_hierarchy.scl ___________________________________________________________________ Added: svn:mergeinfo Index: branches/scool-ng/tests/examples/scool_src/meta_identity.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/meta_identity.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/meta_identity.scl (revision 131) @@ -0,0 +1,4 @@ +identity : [T : type] -> type = +{ + -> T; +} Index: branches/scool-ng/tests/examples/scool_src/container_1.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 131) @@ -0,0 +1,16 @@ +Container : [T : type] -> class = +{ + public + { + value_type : type = T; + + get : () -> value_type = { -> value; } + mutable set : (value : value_type) = { value_ = value; } + } + + private + { + var value_ : value_type; + } +} + Property changes on: branches/scool-ng/tests/examples/scool_src/container_1.scl ___________________________________________________________________ Added: svn:mergeinfo Index: branches/scool-ng/tests/examples/scool_src/container_2.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/container_2.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/container_2.scl (revision 131) @@ -0,0 +1,28 @@ +container : [T : type] -> class = +{ + public + { + value type : type = T; + } + + if [ T == int ] + { + public + { + var value : value_type; + } + } + else + { + public + { + get : () -> value_type = { -> value_ ; } + mutable set : (value : value_type) = { value_ = value; } + } + private + { + var value_ : value_type; + } + } +} + Index: branches/scool-ng/tests/examples/scool_src/meta_type_equality.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/meta_type_equality.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/meta_type_equality.scl (revision 131) @@ -0,0 +1,17 @@ +equal : [T : type] -> class = +{ + public + { + res : type = T; + } +} + +not_equal : class = { } + +are_equal : [T : type, U : type] -> type = +{ + if [ T = U ] + -> equal[T]; + else + -> not_equal; +} Index: branches/scool-ng/tests/examples/scool_src/embeded_c++.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/embeded_c++.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/embeded_c++.scl (revision 131) @@ -0,0 +1,8 @@ +// Example found in van-noppen.09.dslwc +|[ #include <iostream> ]| +f : (arg: int) -> int = +{ + |[ std::cout << arg << std::endl; ]|; + + -> |[ arg + 42 ]|; +} Index: branches/scool-ng/tests/examples/scool_src/fact.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/fact.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/fact.scl (revision 131) @@ -0,0 +1,7 @@ +// Example found in van-noppen.09.dslwc +fact : [N : unsigned] -> unsigned = +{ + if [ N == 0 ] + -> 1; + -> N + fact[N - 1]; +} Index: branches/scool-ng/tests/examples/scool_src/point1d.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/point1d.scl (revision 0) +++ branches/scool-ng/tests/examples/scool_src/point1d.scl (revision 131) @@ -0,0 +1,18 @@ +// Example found in van-noppen.09.dslwc +point1d : class = +{ + public + { + point_type: type = int; + + make : () = { x_ = 0; } + make(x : point_type) = { x_ = x; } + + get_x : () -> point_type = { -> x; } + mutable set_x : (x : point_type) -> point_type = { x_ = x; } + } + private + { + var x_ : point_type; + } +} Index: branches/scool-ng/tests/examples/c++_build/point1d_simple.g++ (deleted) ===================================================================

15 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2009