Olena-patches May 2009

olena-patches@lrde.epita.fr

11 participants
312 discussions

r3854: Add quantification after normalization

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-19 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add quantification after normalization. * fabien/igr/fixed_seg/main.cc: Handle normalized data. * fabien/igr/norm.cc: Normalize. * fabien/igr/smooth_fixed_seg/main.cc: Test different filters. --- fixed_seg/main.cc | 204 ++++++++++++++++++++++++++++++++++++++--------- norm.cc | 14 ++- smooth_fixed_seg/main.cc | 63 +++++++++----- 3 files changed, 218 insertions(+), 63 deletions(-) Index: trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 3853) +++ trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 3854) @@ -25,16 +25,20 @@ #include <mln/data/fill.hh> #include <mln/data/paste.hh> #include <mln/convert/from_to.hh> +#include <mln/fun/v2v/fit.hh> +#include <mln/labeling/compute.hh> #include <mln/labeling/wrap.hh> #include <mln/level/compute.hh> #include <mln/level/convert.hh> #include <mln/level/stretch.hh> +#include <mln/linear/convolve.hh> #include <mln/make/image2d.hh> +#include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> #include <mln/morpho/dilation.hh> #include <mln/morpho/erosion.hh> #include <mln/morpho/closing/structural.hh> -#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/opening/structural.hh> #include <mln/morpho/watershed/flooding.hh> #include <mln/pw/all.hh> @@ -54,6 +58,8 @@ using value::int_u12; using value::label_16; +#define SATURATION 0.5 + @@ -162,24 +168,25 @@ // Edges distance computation. mln_VAR(edges, world::inter_pixel::compute(imax, dist)); + mln_VAR(e, level::transform(edges, fun::v2v::fit<float>(SATURATION))); + io::dump::save(e.unmorph_(), "edges_int_u12.dump"); + typedef int_u12 E_TYPE; { // Display. - mln_VAR(display_ima, world::inter_pixel::display_edge(edges.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_ima), "edges.pgm"); + mln_VAR(display_ima, world::inter_pixel::display_edge(e.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_ima), "01_edges.pgm"); } - // Type change. - mln_VAR(e, level::stretch(int_u8(), edges)); // Closing. - mln_VAR(clo, morpho::closing::volume(e, world::inter_pixel::e2e(), atoi(argv[2]))); + mln_VAR(clo, morpho::closing::area(e, world::inter_pixel::e2e(), atoi(argv[2]))); { // Display. mln_VAR(display_clo, world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_clo), "closing.pgm"); + io::pgm::save(level::stretch(int_u8(), display_clo), "03_closing.pgm"); } @@ -190,7 +197,9 @@ std::cout << "nbasins: " << nbasins << std::endl; + mln_VAR(w_all, wst.unmorph_()); + io::dump::save(w_all, "watershed_edges.dump"); //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); @@ -202,20 +211,32 @@ io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm"); - // Plots. - image2d<L> w_simple = world::inter_pixel::full2image(w_all); - plot_label(input, w_simple, 248u); - plot_label(input, w_simple, 241u); - plot_label(input, w_simple, 238u); - plot_label(input, w_simple, 251u); - plot_label(input, w_simple, 250u); - plot_label(input, w_simple, 249u); - plot_label(input, w_simple, 247u); - plot_label(input, w_simple, 232u); - plot_label(input, w_simple, 252u); - plot_label(input, w_simple, 246u); - plot_label(input, w_simple, 240u); - plot_label(input, w_simple, 237u); + + // Mean distance. + + // Old code. + //accu::mean<E_TYPE> accu_mean; + //util::array<float> means = labeling::compute(accu_mean, e, wst, nbasins); + + // Theo version. + typedef accu::mean<int_u12,float,int_u12> A; + util::array<int_u12> means = labeling::compute(A(), e, wst, nbasins); + + + + // Display. + { + typedef image_if<image2d<float>, world::inter_pixel::is_separator> Fsx; + Fsx ima_means; + initialize(ima_means, wst); + data::paste(wst, ima_means); + for (unsigned i = 1; i < means.nelements(); ++i) + data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); + mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_means), "04_means.pgm"); + } + + return 0; Index: trunk/milena/sandbox/fabien/igr/norm.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/norm.cc (revision 3853) +++ trunk/milena/sandbox/fabien/igr/norm.cc (revision 3854) @@ -20,6 +20,9 @@ // DEBUG #include <mln/core/var.hh> #include <mln/estim/min_max.hh> +#include <mln/io/pgm/save.hh> +#include <mln/level/stretch.hh> +#include <mln/value/int_u8.hh> /*#include <mln/accu/min.hh> #include <mln/accu/max.hh> #include <mln/level/compute.hh>*/ @@ -61,6 +64,9 @@ image2d<float> ima_ini = mean_slices(ima_f, first, last); + // Debug. + //io::pgm::save(level::stretch(value::int_u8(), ima_ini), "mean_slices.pgm"); + image3d<float> ima_result; initialize(ima_result, ima); @@ -80,17 +86,17 @@ int main(int argc, char *argv[]) { - if (argc != 3) + if (argc != 5) { - std::cout << "Usage: " << argv[0] << " ima.dump output.dump" + std::cout << "Usage: " << argv[0] << " ima.dump first_slice last_slice output.dump" << std::endl; return 1; } image3d<int_u12> ima; io::dump::load(ima, argv[1]); - image3d<float> norm = normalize(ima, 1, 8); - io::dump::save(norm, argv[2]); + image3d<float> norm = normalize(ima, atoi(argv[2]), atoi(argv[3])); + io::dump::save(norm, argv[4]); return 0; } Index: trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc (revision 3853) +++ trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc (revision 3854) @@ -1,6 +1,7 @@ #include <algorithm> #include <mln/core/image/image1d.hh> +#include <mln/core/alias/window1d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image3d.hh> @@ -22,7 +23,9 @@ #include <mln/accu/sum.hh> #include <mln/accu/mean.hh> +#include <mln/accu/image/all.hh> #include <mln/accu/stat/deviation.hh> +#include <mln/arith/div.hh> #include <mln/data/fill.hh> #include <mln/data/paste.hh> #include <mln/debug/quiet.hh> @@ -34,10 +37,13 @@ #include <mln/level/convert.hh> #include <mln/level/stretch.hh> #include <mln/make/image2d.hh> +#include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> #include <mln/morpho/dilation.hh> #include <mln/morpho/erosion.hh> #include <mln/morpho/closing/area.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/opening/structural.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/watershed/flooding.hh> #include <mln/pw/all.hh> @@ -61,10 +67,73 @@ using value::label_16; using value::float01_8; -#define SATURATION 0.6 +const float saturation = 1.0; +namespace mln +{ + + struct int_u12_from_float : Function_v2v< int_u12_from_float > + { + typedef value::int_u12 result; + result operator()(float f) const + { + mln_precondition(f >= 0.f && f <= 1.f); + unsigned i = f / saturation * 4095; + return i > 4095 ? 4095 : i; + } + }; + + + template <typename I> + void io_save_edges_int_u12(const I& input, + value::int_u8 bg, + const std::string& filename) + { + mlc_equal(mln_value(I), value::int_u12)::check(); + mln_ch_value(I, value::int_u8) output; + initialize(output, input); + arith::div_cst(input, 16, output); + io::pgm::save(world::inter_pixel::display_edge(output.unmorph_(), + bg, + 3), + filename); + } + +} // end of namespace mln + + + +// Mean image. +//------------ +template <typename V> +inline +image1d<float> +mean_image(image1d<V>& input) +{ + window1d win_1; + win_1 + .insert(-2) + .insert(-1) + .insert(0) + .insert(1) + .insert(2); + + image1d<V> closing_ima = morpho::closing::structural(input, win_1); + image1d<V> opening_ima = morpho::opening::structural(input, win_1); + + image1d<accu::mean<float> > result; + + initialize(result, input); + + accu::image::init(result); + accu::image::take(result, closing_ima); + accu::image::take(result, opening_ima); + + return accu::image::to_result(result); +} + // Distance function. @@ -72,10 +141,10 @@ struct dist_t : Function_vv2v<dist_t> { - typedef float result; + typedef int_u12 result; template <typename V> - float operator()(util::array<V> v1, util::array<V> v2) const + int_u12 operator()(util::array<V> v1, util::array<V> v2) const { float res = 0.f; @@ -92,13 +161,51 @@ convert::from_to(v2, tmp_ima2); float sum_v2 = level::compute(accu_sum, tmp_ima2); + if (sum_v1 == 0 && sum_v2 == 0) + return 1; + res /= std::max(sum_v1, sum_v2); + res = 1 - res; + res = res * 4095; - return 1 - res; + return (int) res; } } dist; +/*struct dist_morpho_t : Function_vv2v<dist_morpho_t> +{ + typedef float result; + + template <typename V> + float operator()(util::array<V> v1, util::array<V> v2) const + { + float res = 0.f; + + accu::sum<V> accu_sum; + + image1d<V> tmp_ima; + convert::from_to(v1, tmp_ima); + image1d<float> morpho_ima = mean_image(tmp_ima); + float sum_v1 = level::compute(accu_sum, morpho_ima); + + image1d<V> tmp_ima2; + convert::from_to(v2, tmp_ima2); + image1d<float> morpho_ima2 = mean_image(tmp_ima2); + float sum_v2 = level::compute(accu_sum, morpho_ima2); + + mln_piter(image1d<float>) p(morpho_ima.domain()); + for_all(p) + res += std::min(morpho_ima(p), morpho_ima2(p)); + + if (sum_v1 == 0 && sum_v2 == 0) + return 1; + + res /= std::max(sum_v1, sum_v2); + + return 1 - res; + } +} dist_morpho;*/ @@ -107,28 +214,35 @@ int usage(const char* bin) { - std::cout << "Usage: " << bin << " input.dump closing" << std::endl; + std::cout << "Usage: " << bin << " input.dump min smooth lambda" << std::endl; return 1; } int main(int argc, char* argv[]) { - if (argc != 3) + if (argc != 5) return usage(argv[0]); + float min = atof(argv[2]); + unsigned is_smooth = atoi(argv[3]); + unsigned lambda = atoi(argv[4]); + // Initialization. - image3d<int_u12> input; + typedef float input_type; + image3d<input_type> input; io::dump::load(input, argv[1]); - typedef image2d<util::array<int_u12> > I; + int min_slice = input.bbox().pmin().sli(); + int max_slice = input.bbox().pmax().sli(); + typedef image2d<util::array<input_type> > I; I ima_arr; initialize(ima_arr, slice(input, 0)); - for (unsigned int i = 0; i < input.nslices(); ++i) + for (int i = min_slice; i <= max_slice; ++i) { - image2d<int_u12> tmp_slice = duplicate(slice(input, i)); - mln_piter_(image2d<int_u12>) p(tmp_slice.domain()); + image2d<input_type> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<input_type>) p(tmp_slice.domain()); for_all(p) - ima_arr(p).append(tmp_slice(p)); + ima_arr(p).append(tmp_slice(p) - min); // We set the minimum value to 0. } @@ -137,37 +251,31 @@ Ix imax = world::inter_pixel::immerse(ima_arr); // Edges distance computation. - mln_VAR(edges, world::inter_pixel::compute(imax, dist)); - mln_VAR(e, level::transform(edges, fun::v2v::fit<float>(SATURATION))); - typedef int_u12 E_TYPE; - - { - // Display. - mln_VAR(display_ima, world::inter_pixel::display_edge(e.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_ima), "01_edges.pgm"); - } - + image_if<image2d<int_u12>, world::inter_pixel::is_separator> edges; + //if (!is_smooth) + edges = world::inter_pixel::compute(imax, dist); + //else + // edges = world::inter_pixel::compute(imax, dist_morpho); + //io::dump::save(edges.unmorph_(), "edges.dump"); + //mln_VAR(d, level::transform(edges, int_u12_from_float())); + io_save_edges_int_u12(edges, 0, "dist.pgm"); // Closing. - mln_VAR(clo, morpho::closing::area(e, world::inter_pixel::e2e(), atoi(argv[2]))); - - { - // Display. - mln_VAR(display_clo, world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_clo), "03_closing.pgm"); - } + /*mln_VAR(d_clo, morpho::closing::area(d, world::inter_pixel::e2e(), lambda)); + //io_save_edges_int_u12(d_clo, 0, "d_clo.pgm"); // Watershed. typedef label_16 L; L nbasins; - mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); + mln_VAR(wst, morpho::watershed::flooding(d_clo, world::inter_pixel::e2e(), nbasins)); - std::cout << "nbasins: " << nbasins << std::endl; + std::cout << "nbasins: " << nbasins << std::endl;*/ - mln_VAR(w_all, wst.unmorph_()); + /*mln_VAR(w_all, wst.unmorph_()); + io::dump::save(w_all, "watershed_edges.dump"); //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); @@ -176,12 +284,13 @@ data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); - io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm"); + io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm");*/ // Mean distance. - accu::mean<E_TYPE> accu_mean; + + /*accu::mean<E_TYPE> accu_mean; util::array<float> means = labeling::compute(accu_mean, e, wst, nbasins); // Display. @@ -194,12 +303,31 @@ data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); io::pgm::save(level::stretch(int_u8(), display_means), "04_means.pgm"); + }*/ + + /*typedef accu::mean<int_u12,float,int_u12> A; + util::array<int_u12> m = labeling::compute(A(), d, wst, nbasins); + + { + util::array<int_u8> m_(nbasins.next()); + m_[0] = 1; // watershed line <=> 1 + for (unsigned l = 1; l <= nbasins; ++l) + { + m_[l] = m[l] / 16; + if (m_[l] < 2) m_[l] == 2; + // basin <=> 2..255 } + mln_VAR(d_m, level::transform(wst, m_)); + mln_VAR(out, world::inter_pixel::display_edge(d_m.unmorph_(), + 0, // background <=> 0 + 3)); + io::pgm::save(out, "dist_mean.pgm"); + }*/ // Deviation. - util::array<accu::stat::deviation<float> > arr_dev; + /*util::array<accu::stat::deviation<float> > arr_dev; for (unsigned i = 0; i < means.nelements(); ++i) arr_dev.append(accu::stat::deviation<float> (means[i])); util::array<float> deviations = labeling::compute(arr_dev, e, wst, nbasins); @@ -214,19 +342,19 @@ data::fill((ima_dev | pw::value(ima_dev) == pw::cst(i)).rw(), deviations[i]); mln_VAR(display_dev, world::inter_pixel::display_edge(ima_dev.unmorph_(), 0.0, 3)); io::pgm::save(level::stretch(int_u8(), display_dev), "05_dev.pgm"); - } + }*/ // Plots labels. - image2d<L> w_simple = world::inter_pixel::full2image(w_all); + /*image2d<L> w_simple = world::inter_pixel::full2image(w_all); plot_label(input, w_simple, 191u); plot_label(input, w_simple, 171u); plot_label(input, w_simple, 188u); plot_label(input, w_simple, 16u); - plot_label(input, w_simple, 187u); + plot_label(input, w_simple, 187u);*/

15 years, 7 months

[Olena] #168: Revamp mln::topo::internal::complex_data<D>

by Olena

#168: Revamp mln::topo::internal::complex_data<D> -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: cleanup | -------------------------+-------------------------------------------------- See source:branches/cleanup-2008/milena/mln/topo/complex.hh * Store only the indices of adjacent faces in `complex_data<D>`: we don't really need actual faces there, and it costs a lot (memory, execution time, design complexity, etc.) * Then (or concurrently) simplify the design: use an array of array instead of an ad hoc type list. * The '''dynamic''' access(es) to the set of ''n''-faces of a complex (e.g., `mln::complex::nfaces(unsigned)`) has (have) a linear complexity! We should get rid of that. We could create an index at the creation of the complex, mapping dynamic dimension numbers to the corresponding (static) mixin/data. -- Ticket URL: <https://trac.lrde.org/olena/ticket/168> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #149: Revamp util::graph

by Olena

#149: Revamp util::graph -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- * Get rid of superfluous dynamic allocations (w.r.t. vertices & edges handling). * Move properties attached to vertices and edges out of the graph (this should allow the merging of `util::graph` and `util::internal::graph_base`. * Allow the removal of vertices and edges. Don't forget to warn users about the invalidation of vertex and edge ids (handlers). * Stop using the term « id » (« identifier ») for vertices and edges, and prefer the term « handler » ? (The BGL call them « descriptors ».) All these changes might bring us closer to the BGL' `adjacency_list`. See how we could factor things, while not requiring a dependency on the BGL. -- Ticket URL: <https://trac.lrde.org/olena/ticket/149> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #171: Complete and factor the classic/regular point types

by Olena

#171: Complete and factor the classic/regular point types ------------------------------+--------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: code duplication | ------------------------------+--------------------------------------------- Several tasks, that may be performed independently: * Add `mln::point1df` and `mln::point2df`.[[BR]] (Class `mln::point3df` is already implemented, see source:branches/cleanup-2008/milena/mln/core/alias/point3df.hh.) * For ''N'' in {1, 2, 3}, factor the implementation of `mln::point`''N''`d` and `mln::point`''N''`df`.[[BR]] (See * source:branches/cleanup-2008/milena/mln/core/alias/point3d.hh, and * source:branches/cleanup-2008/milena/mln/core/alias/point3df.hh, which share most of their code!) Remark: all these types are located in `mln/core/alias/`, but they are more than mere aliases; move them elsewhere? -- Ticket URL: <https://trac.lrde.org/olena/ticket/171> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #153: Write a test using Ubigraph

by Olena

#153: Write a test using Ubigraph -----------------------------------+---------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: rendering third-party | -----------------------------------+---------------------------------------- Ubigraph is a promising graph manipulation and visualization project: * http://ubietylab.net/ubigraph/ We could write a small test exercising its display capabilities, e.g., the construction of a skeleton on a binary, graph-based image (even a 2-D image on a regular grid). Check the license(s); the client part is Free Software, but the server doesn't seem so. -- Ticket URL: <https://trac.lrde.org/olena/ticket/153> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #143: Reorganize milena/mln/core/

by Olena

#143: Reorganize milena/mln/core/ ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- (This ticket is just a proposal. We might close it even if no change occur in `milena/mln/core`.) There are many things in source:trunk/milena/mln/core/, that could be reorganized and/or split in several directories/subdirectories: * basic/classic images and entites (`mln::image2d`, etc.) * graph-based images and entities (`mln::graph_image`, etc.) * non classic images and associated tools (`mln::rle_image`, etc.) * morphers (`mln::cast_image`, etc.) * internal/core mechanisms (`initialize.hh` etc.) * general tools (`contract.hh`, `inplace.hh`, etc.) * concepts (though they are located in their own directory, `mln/core/concept/`) * implementation/factoring classes (thought most of them are in `mln/core/internal/`) * other entities, that should be moved elsewhere (`mln::h_vec`, etc.) * and so on. To my (Roland) mind, we should: 1. Identify the different kind of files present in `core/`. 2. Assign one (maybe two) kinds to each file of this directory. 3. Determine a new file layout, and perform the moves. -- Ticket URL: <https://trac.lrde.org/olena/ticket/143> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

Re: [Olena-patches] [Olena] #114: Add support for libfitsio

by Olena Trac

#114: Add support for libfitsio -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: autoconf m4 macro -----------------------+---------------------------------------------------- Changes (by levill_r): * milestone: Olena 1.1 => Olena 1.0 Comment: Set back to milestone:"Olena 1.0". Postpone again to milestone:"Olena 1.1" if we do not have enough time. -- Ticket URL: <https://trac.lrde.org/olena/ticket/114#comment:5> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #167: Write iterators on complexes

by Olena

#167: Write iterators on complexes ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Most of this task is described in [source:branches/cleanup-2008/milena/tests/topo/complex.cc tests/topo/complex.cc] (r2411) : {{{ /*------------------------------. | Iterators on adjacent faces. | `------------------------------*/ /* FIXME: Write and exercise more iterators (see milena/tests/core/complex_image.cc) and ticket #162 (https://trac.lrde.org/olena/ticket/162) */ /* Iterate on the the set of (n-1)-faces adjacent to AF. Note: this can be solved with iterators where the dimension can be either static or dynamic. Let's start with a dynamic one, as it would allow us to write something like this: mln_fwd_citer_(topo::complex<D>) f(c); mln_fwd_lower_nciter(topo::complex<D>) n(c); for_all(c) for_all(n) // ... (Note: we might want to get rid of the name `citer', and use `fiter' everywhere.). A static version might be useful (and more efficient) too. Likewise, our iterators on n-faces (both faces_piter and complex_faces_piter) use a static `n'. We should also have n-faces iterators where n could be dynamic. But first, we need to clarify (existing) names. ----------------------------------------------------------------- Current name New name Definition ----------------------------------------------------------------- complex<D> (n/a) General complex face<N, D> face_data<N, D> Face data face_handle<N, D> n_face<N, D> (Static) n-face handle faces_set<N, D> n_faces_set<N, D> Set of face handles any_face_handle<D> face<D> Dynamic face handle complex_fwd_iter_<D>(c) face_fwd_iter<D>(c) | Iterators on all complex_bkd_iter_<D>(c) face_bkd_iter<D>(c) | faces of c complex_iter_base_<F, E> complex_iter_base<F, E> | Factoring base | class. ----------------------------------------------------------------- (Note: get rid of trailing underscores, even for entities in mln::internal::.) Next, write these: ----------------------------------------------------------------- Name Definition ----------------------------------------------------------------- n_faces_fwd_iter<D>(c) | Iterators on n-faces, n_faces_bkd_iter<D>(c) | n being dynamic adj_lower_faces_fwd_iter<D>(c, f) | Iterators on the adjacent adj_lower_faces_bkd_iter<D>(c, f) | (lower) (n-1)-faces of the | n-face f of the complex c, | n being dynamic adj_higher_faces_fwd_iter<D>(c, f) | Iterators on the adjacent adj_higher_faces_bkd_iter<D>(c, f) | (higher) (n+1)-faces of the | n-face f of the complex c, | n being dynamic adj_lower_dim_connected_n_faces_fwd_iter<D>(c, f) adj_lower_dim_connected_n_faces_bkd_iter<D>(c, f) (FIXME: These names are admittedly too long.) | Iterators on the the set of | n-faces sharing an adjacent | (n-1)-face with f, n being | dynamic adj_higher_dim_connected_n_faces_fwd_iter<D>(c, f) adj_higher_dim_connected_n_faces_bkd_iter<D>(c, f) (FIXME: These names are admittedly too long.) | Iterators on the the set of | n-faces sharing an adjacent | (n+1)-face with f, n being | dynamic cell_fwd_iter<D>(c, f) | Iterators on the set of the cell_bkd_iter<D>(c, f) | faces in the « cell » | including p, i.e. the set of | all m-faces adjacent to p, | where m is in [0, n-1]; | this set is name « f-hat » cell_boundary_fwd_iter<D>(c, f) | Likewise, but excluding p; cell_boundary_bkd_iter<D>(c, f) | this set is named « p-hat* » ----------------------------------------------------------------- We could also have generic iterators based on predicated, and even use them to provide first (non efficient) implementations of the iterators from the previous list. ----------------------------------------------------------------- Name Definition ----------------------------------------------------------------- generic_face_fwd_iter<D>(c, pred) | Generic face iterators on c generic_face_bkd_iter<D>(c, pred) | using predicate pred to | define the iterated subset. ----------------------------------------------------------------- I'm unsure about the following existing iterators; should we keep them? What are they good for, except testing our code? ----------------------------------------------------------------- Current name Definition ----------------------------------------------------------------- complex_faces_fwd_iter_<N, D> Iterators on N-faces, N being complex_faces_fwd_iter_<N, D> static, acting as proxies of face_handle<N, D>'s. faces_fwd_iter_<N, D> Iterators on N-faces, N being faces_fwd_iter_<N, D> static, acting as proxies of any_face_handle<N, D>'s. ----------------------------------------------------------------- */ }}} (This should be turned into actual documentation, BTW.) See also #162 for applications of these iterators in windows/neighborhoods and images. -- Ticket URL: <https://trac.lrde.org/olena/ticket/167> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #161: Implement more complex psite iterators

by Olena

#161: Implement more complex psite iterators ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- As of r2148, we only have a single piter couple on complex : `mln::p_complex_fwd_piter_` and `mln::p_complex_bkd_piter_` (source:trunk/milena/mln/core/p_complex_piter.hh:2148). Comments (FIXMEs) at the end of source:trunk/milena/tests/core/complex_image.cc:2148 suggest to add these additional iterators: * iterators on ''n''-faces with ''n'' fixed in [0, ''d''] (using `mln::p_faces` and `mln::faces_psite`?) * iterators on ''n''-faces with ''n'' in a subset of [0, ''d'']; * etc. -- Ticket URL: <https://trac.lrde.org/olena/ticket/161> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #140: Add points having floating-point coordinates

by Olena

#140: Add points having floating-point coordinates ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Name regular instances `point1df`, `point2df` and `point3df`. (N.B.: Aroune will need them so as to build the 3-d surface graph from a set of triangles.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/140> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
32
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 May 2009