Olena-patches January 2013

olena-patches@lrde.epita.fr

7 participants
66 discussions

[Olena] #147: Write a script to automatically generate file skeletons for Olena

by Olena

#147: Write a script to automatically generate file skeletons for Olena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Component: Milena | Version: 1.0 Keywords: generator | -----------------------+---------------------------------------------------- A Ruby script would be nice, but the language doesn't really matter. -- Ticket URL: <https://trac.lrde.org/olena/ticket/147> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #190: Handle Trimesh's dependencies on third-party packages.

by Olena Trac

#190: Handle Trimesh's dependencies on third-party packages. --------------------------------+------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Keywords: Autoconf configure | --------------------------------+------------------------------------------- * OpenGL/Mesa (for Trimesh) * We should check for the presence of `GL/gl.h`, `GL/glu.h` and `libXmu.{a,so}` to enable OpenGL conditionally. * Note: on Debian, Mesa users have to install these packages: * `mesa-common-dev` (for `GL/gl.h`) * `libglu1-mesa-dev` (for `GL/glu.h`) * `libxmu-dev` (for `libXmu.{a,so}`). -- Ticket URL: <https://trac.lrde.org/olena/ticket/190> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #238: Have Swilena be compatible with (also) Python 2.6 (and greater)

by Olena Trac

#238: Have Swilena be compatible with (also) Python 2.6 (and greater) -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Swilena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Swilena does not work with Python 2.6 (and probably greater versions). Swig seems to generates wrappers correctly, and they compile fine, but tests fail at run time. There may have been changes in Python's API between versions 2.5 and 2.6 (perhaps iterators?). Investigate. -- Ticket URL: <https://trac.lrde.org/olena/ticket/238> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #160: Revamp complexes

by Olena

#160: Revamp complexes ----------------------------+----------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: cleanup rename | ----------------------------+----------------------------------------------- * Move complexes from `mln/core/` to `mln/topo/`. * 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. Ask Roland for details. -- Ticket URL: <https://trac.lrde.org/olena/ticket/160> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #227: List of dependencies out of date in the wiki

by Olena Trac

#227: List of dependencies out of date in the wiki --------------------------+------------------------------------------------- Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: Dependencies | --------------------------+------------------------------------------------- In the download page, [http://www.lrde.epita.fr/cgi- bin/twiki/view/Olena/Download], the list of dependencies is out of date. Especially for the git repository version, additional dependencies are needed to build the documentation. It should be clarified in the wiki or the building procedure should be improved. ****************** A non exhaustive(?) list of dependencies: autogen automake1.7 autoconf make g++ libboost-dev texlive-latex-base texlive-extra-utils pgf HeVeA latex2html doxygen imagemagick dot2tex -- Ticket URL: <https://trac.lrde.org/olena/ticket/227> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #232: Update contributors' list on Olena's Web site

by Olena Trac

#232: Update contributors' list on Olena's Web site ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.1 Component: Web | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- This page : https://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Contributors should be updated with the latest version (e.g., from branch `next`) of this file : source:AUTHORS Better: write a script to automate the conversion, so as to simplify the process of updating this page down to a copy-and-paste operation. -- Ticket URL: <https://trac.lrde.org/olena/ticket/232> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 5 months

[Olena] #236: Implement a VTK loader

by Olena Trac

#236: Implement a VTK loader ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: I/O | ----------------------+----------------------------------------------------- I.e., `mln::io::vtk::load`. See also source:milena/mln/io/vtk/save.hh. -- Ticket URL: <https://trac.lrde.org/olena/ticket/236> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 10 months

[Olena] #188: Implement more windows, neighborhoods, and corresponding iterators for complex-based images

by Olena Trac

#188: Implement more windows, neighborhoods, and corresponding iterators for complex-based images ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- This ticket is a sequel to #162. In addition to the neighborhoods, windows, and iterators for complex-based images from #162, implement windows/neighborhoods (and corresponding iterators) returning the following elements (where ''n'' is a (fixed) dimension and ''p'' a psite on an ''n''-face). `complex_cell_window`:: the set of the faces in the « cell » including ''p'' (named « ''p''-hat » in couprie.08.pami), i.e. the set of all ''m''-faces transitively adjacent to ''p'', where ''m'' is in [0, ''n''-1].[[BR]] In that definition, ''p'' is said adjacent to an ''m''-face ''q'' if there is a sequence (''m,,1,,'', ''m,,2,,'', ..., ''m,,k,,'') of faces so that * ''m,,1,,'' is an (''n''-1)-face adjacent to ''p'' ; * ''m,,2,,'' is an (''n''-2)-face adjacent to ''m,,1,,'' ; * ... (and so on) * ''m,,k,,'' is an (''m''+1)-face adjacent to ''q''. `complex_boundary_cell_window`:: Likewise, but excluding ''p'' (named « ''p''-hat* » in couprie.08.pami). And maybe: `complex_lower_dims_connected_window`:: the set of ''n''-faces sharing a (''n''-1)-face or (''n''-2)-face etc. (by transitivity) with ''p'' (is it useful?); `complex_higher_dims_connected_window`:: the set of ''n''-faces sharing a (''n''+1)-face or (''n''+2)-face etc. (by transitivity) with ''p'' (is it useful?); * what else? As in #139, * we might want to factor things using implementation classes: * ``mln::internal::complex_vicinity`` * ``mln::internal::complex_vicinity_piter`` (we might even be able to factor them with graph-based ones); * we could have one or several generic classes, using static or dynamic predicates, to implement those windows and neighborhoods. Note that some of these iterators might implement operators on complexes, see http://en.wikipedia.org/wiki/Simplicial_complex#Closure.2C_star.2C_and_link. Do not forget to update [wiki:Olena/ComplexBasedImages]. -- Ticket URL: <https://trac.lrde.org/olena/ticket/188> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 10 months

branch Sylvain updated: last-svn-commit-841-g5a65d5b

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch Sylvain has been updated via 5a65d5b56db50e1b07742b8c095f1125674a0868 (commit) via 19e7b17c5eea3a2858d8779f38bc7400db99724e (commit) via 016f6d574d22b20c4a6f4c9a48551c7a8e801755 (commit) via 57c0c887bc2dfb1fe027b0bf7cb82fc576c7fd5b (commit) from 161d9e36b73cf9a42837c60fda6e8005ec2c1b43 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5a65d5b Added a simple combination. 19e7b17 Added functions used in the trust map computation. 016f6d5 Added Horn-Schunck algorithm 57c0c88 Added Lucas-Kanade algorithm ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 24 ++ .../combination/verysimple.hh} | 71 +++--- milena/mln/optical_flow/hs.hh | 158 +++++++++++++ milena/mln/optical_flow/lk.hh | 185 +++++++++++++++ milena/mln/optical_flow/trustmap.hh | 237 ++++++++++++++++++++ 5 files changed, 637 insertions(+), 38 deletions(-) copy milena/mln/{morpho/tree/propagate_representative.hh => optical_flow/combination/verysimple.hh} (50%) create mode 100644 milena/mln/optical_flow/hs.hh create mode 100644 milena/mln/optical_flow/lk.hh create mode 100644 milena/mln/optical_flow/trustmap.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 10 months

last-svn-commit-841-g5a65d5b Added a simple combination.

by Sylvain Lobry

* mln/optical_flow/combination/verysimple.hh: Here. --- milena/ChangeLog | 6 ++ .../combination/verysimple.hh} | 71 +++++++++----------- 2 files changed, 39 insertions(+), 38 deletions(-) copy milena/mln/{morpho/tree/propagate_representative.hh => optical_flow/combination/verysimple.hh} (50%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9a6f18d..557569c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added a simple combination. + + * mln/optical_flow/combination/verysimple.hh: Here. + +2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added functions used in the trust map computation. * mln/optical_flow/trustmap.hh: Here. diff --git a/milena/mln/morpho/tree/propagate_representative.hh b/milena/mln/optical_flow/combination/verysimple.hh similarity index 50% copy from milena/mln/morpho/tree/propagate_representative.hh copy to milena/mln/optical_flow/combination/verysimple.hh index 64d91b4..fe4ad0e 100644 --- a/milena/mln/morpho/tree/propagate_representative.hh +++ b/milena/mln/optical_flow/combination/verysimple.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,67 +24,61 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_MORPHO_TREE_PROPAGATE_REPRESENTATIVE_HH -# define MLN_MORPHO_TREE_PROPAGATE_REPRESENTATIVE_HH +#ifndef MLN_OPTICAL_FLOW_COMBINATION_VERYSIMPLE_HH_ +# define MLN_OPTICAL_FLOW_COMBINATION_VERYSIMPLE_HH_ /// \file /// -/// Component tree routines. - +/// \brief The simpliest combination. +# include <mln/value/int_u8.hh> +# include <mln/core/alias/vec2d.hh> # include <mln/core/concept/image.hh> -# include <mln/morpho/tree/data.hh> - +# include <mln/win/rectangle2d.hh> +# include <mln/pw/value.hh> +# include <mln/core/image/dmorph/image_if.hh> namespace mln { - namespace morpho + namespace optical_flow { - namespace tree + namespace combination { - /// Propagate the representative node's value to - /// non-representative points of the component. + /// \brief The simpliest combination /// - /// \param t Component tree. - /// \param f_ Value image. - // - template <typename T, typename F> - void - propagate_representative(const T& t, Image<F>& f_); - + /// @param optical_flowHS The optical flow from the global algorithm + /// @param optical_flowLK The optical flow from the local algorithm + /// @param mask The mask of the trust map + void + verysimpleCombination (mln::image2d<mln::vec2d_f>& optical_flowHS, + mln::image2d<mln::vec2d_f>& optical_flowLK, + mln::image2d<bool>& mask); # ifndef MLN_INCLUDE_ONLY - - - template <typename T, typename F> - inline void - propagate_representative(const T& t, Image<F>& f_) + verysimpleCombination (mln::image2d<mln::vec2d_f>& optical_flowHS, + mln::image2d<mln::vec2d_f>& optical_flowLK, + mln::image2d<bool>& mask) { - F a = exact(f_); - mln_precondition(a.is_valid()); + mln_piter_ (mln::image2d<mln::vec2d_f>) p2 (optical_flowHS.domain()); - mln_up_site_piter(T) p(t); - for_all(p) - if (! t.is_a_node(p)) - { - mln_assertion(t.is_a_node(t.parent(p))); - a(p) = a(t.parent(p)); - } + for_all(p2) + { + if (mask(p2) == false) + optical_flowLK(p2) = optical_flowHS(p2); + } } - # endif // ! MLN_INCLUDE_ONLY + } //end of namespace combination - } // end of namespace mln::morpho::tree - - } // end of namespace mln::morpho + } //end of namespace optical_flow -} // end of namespace mln +} //end of namespace mln -#endif // ! MLN_MORPHO_TREE_PROPAGATE_REPRESENTATIVE_HH +#endif // ! MLN_OPTICAL_FLOW_COMBINATION_VERYSIMPLE_HH_ -- 1.7.2.5

11 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches January 2013