- Olena-patches

last-svn-commit-276-g460f059 Add from_to overloads for conversions from algebra::vec to point.
by Guillaume Lazzara 01 Jul '10

01 Jul '10

* mln/convert/from_to.hxx: Add new prototypes. * mln/core/point.hh: Add new from_to overloads. Remove specialized constructors causing ambiguities. --- milena/ChangeLog | 9 ++ milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 206 bytes milena/mln/convert/from_to.hxx | 10 ++ milena/mln/core/point.hh | 162 ++++++++++++++++++++++--------- 4 files changed, 133 insertions(+), 48 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0ba1a95..e265636 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add from_to overloads for conversions from algebra::vec to point. + + * mln/convert/from_to.hxx: Add new prototypes. + + * mln/core/point.hh: Add new from_to overloads. Remove specialized + constructors causing ambiguities. + 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> Add a function to convert qt::rgb32 values to int_u8. diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index 31ae37215fdfc5fe715aef7117f676ee6066ab0f..0e507e87c48d7fd2f555801024e916fe6fc13d5c 100644 GIT binary patch delta 94 wcmX@dc#d&GdH9_>xj@7K187{BFo>R=C=WzH#+`st2p7Tza)AgU1r&h*0MhUlfdBvi delta 94 wcmX@dc#d&Gd3Z;!CJ-^e02&u245BwgPXZz!W3}FM2p7Tza)AgU1r&h*00lu6X#fBK diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 5007baf..98f9420 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -147,6 +147,16 @@ namespace mln void from_to_(const point<G,C1>& from, point<G,C2>& to); + // algebra::vec -> point + template <unsigned n, typename C1, typename G, typename C2> + void + from_to_(const algebra::vec<n,C1>& from, point<G,C2>& to); + + // algebra::vec -> point + template <unsigned n, typename C1, typename G> + void + from_to_(const algebra::vec<n,C1>& from, point<G,C1>& to); + // algebra::vec -> Gpoint. template <unsigned n, typename T, typename P> void diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index 8da15b6..49a519e 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -74,6 +74,14 @@ namespace mln template <typename G, typename C1, typename C2> void from_to_(const point<G,C1>& from, point<G,C2>& to); + template <unsigned n, typename C1, typename G, typename C2> + void + from_to_(const algebra::vec<n,C1>& from, point<G,C2>& to); + + template <unsigned n, typename C1, typename G> + void + from_to_(const algebra::vec<n,C1>& from, point<G,C1>& to); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert @@ -89,6 +97,7 @@ namespace mln { typedef algebra::vec<G::dim, float> ret; }; + } /// Generic point class. @@ -153,8 +162,6 @@ namespace mln point(const algebra::vec<dim,C2>& v); point(const algebra::vec<dim,C>& v); - point(const algebra::vec<dim,double>& v); - point(const algebra::vec<dim,float>& v); /// \{ Constructors with different numbers of arguments @@ -210,6 +217,9 @@ namespace mln /// Point with all coordinates set to the mininum value. static const point<G,C>& minus_infty(); + /// Return the underlying vector storing the coordinates. + algebra::vec<G::dim, C>& hook_coord_(); + protected: algebra::vec<G::dim, C> coord_; }; @@ -249,6 +259,49 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename C, typename C2> + inline + C + convert_data_(metal::bool_<false>, const C2& v) + { + return static_cast<C>(v); + } + + template <typename C, typename C2> + inline + C + convert_data_(metal::bool_<true>, const C2& v) + { + return round(v); + } + + template <typename C, typename C2> + inline + C + convert_data(const C2& v) + { + // If (C != float && C != double) && (C2 == float || C2 == double) + // => We want to round the value. + // Otherwise we can just statically cast. + // + return convert_data_<C>( + typename mlc_and( + mlc_and(mlc_is_not(C,float), + mlc_is_not(C,double)), + mlc_or(mlc_is(C2,float), + mlc_is(C2, double)))::check_t(), v); + } + + + + } // end of namespace mln::internal + + + namespace convert { @@ -261,9 +314,57 @@ namespace mln from_to_(const point<G,C1>& from, point<G,C2>& to) { mlc_converts_to(C1,C2)::check(); - to = point<G,C2>(from.to_vec()); + enum { dim = G::dim }; + + for (unsigned i = 0; i < dim; ++i) + to[i] = internal::convert_data<C2>(from[i]); } + + template <unsigned n, typename C1, typename G, typename C2> + inline + void + from_to_(const algebra::vec<n,C1>& from, point<G,C2>& to) + { + mlc_converts_to(C1, C2)::check(); + enum { dim = G::dim }; + mlc_bool(G::dim == n)::check(); + + unsigned j = 0; + //FIXME: to be improved while adding a conversion routine. + if (dim < 3) + to.hook_coord_() = from; + else + { + for (unsigned i = dim - 2; i < dim; ++i) + to[i] = internal::convert_data<C2>(from[j++]); + for (unsigned i = 2; i < dim; ++i, ++j) + to[i-j] = internal::convert_data<C2>(from[j]); + } + } + + template <unsigned n, typename C1, typename G> + inline + void + from_to_(const algebra::vec<n,C1>& from, point<G,C1>& to) + { + enum { dim = G::dim }; + mlc_bool(G::dim == n)::check(); + + unsigned j = 0; + //FIXME: to be improved while adding a conversion routine. + if (dim < 3) + to.hook_coord_() = from; + else + { + for (unsigned i = dim - 2; i < dim; ++i) + to[i] = from[j++]; + for (unsigned i = 2; i < dim; ++i, ++j) + to[i-j] = from[j]; + } + } + + } // end of namespace mln::convert::over_load } // end of namespace mln::convert @@ -315,18 +416,7 @@ namespace mln inline point<G,C>::point(const algebra::vec<dim,C2>& v) { - mlc_converts_to(C2, C)::check(); - unsigned j = 0; - //FIXME: to be improved while adding a conversion routine. - if (dim < 3) - coord_ = v; - else - { - for (unsigned i = dim - 2; i < dim; ++i) - coord_[i] = static_cast<C>(v[j++]); - for (unsigned i = 2; i < dim; ++i, ++j) - coord_[i-j] = static_cast<C>(v[j]); - } + convert::over_load::from_to_(v, *this); } @@ -334,42 +424,10 @@ namespace mln inline point<G,C>::point(const algebra::vec<dim,C>& v) { - unsigned j = 0; - //FIXME: to be improved while adding a conversion routine. - if (dim < 3) - coord_ = v; - else - { - for (unsigned i = dim - 2; i < dim; ++i) - coord_[i] = v[j++]; - for (unsigned i = 2; i < dim; ++i, ++j) - coord_[i-j] = v[j]; - } + convert::over_load::from_to_(v, *this); } - template <typename G, typename C> - inline - point<G,C>::point(const algebra::vec<dim,double>& v) - { - unsigned j = 0; - for (unsigned i = dim - 2; i < dim; ++i) - coord_[i] = round(v[j++]); - for (unsigned i = 2; i < dim; ++i, ++j) - coord_[i-j] = round(v[j]); - } - - template <typename G, typename C> - inline - point<G,C>::point(const algebra::vec<dim,float>& v) - { - unsigned j = 0; - for (unsigned i = dim - 2; i < dim; ++i) - coord_[i] = round(v[j++]); - for (unsigned i = 2; i < dim; ++i, ++j) - coord_[i-j] = round(v[j]); - } - template <typename G, typename C> inline @@ -563,6 +621,14 @@ namespace mln return the_; } + template <typename G, typename C> + inline + algebra::vec<G::dim, C>& + point<G,C>::hook_coord_() + { + return coord_; + } + namespace internal { -- 1.5.6.5

1 0

Re: [Olena-patches] last-svn-commit-230-g7b21118 m4/autotroll.m4: Fix invalid configuration when Qt is missing.
by Guillaume Lazzara 01 Jul '10

01 Jul '10

Roland Levillain wrote: > Don't forget to report this upstream (unless you already took care of > it). Thanks in avance! Done. Thanks.

1 0

last-svn-commit-230-g7b21118 m4/autotroll.m4: Fix invalid configuration when Qt is missing.
by Guillaume Lazzara 01 Jul '10

01 Jul '10

--- ChangeLog | 4 ++++ m4/autotroll.m4 | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac87741..4cac155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/autotroll.m4: Fix invalid configuration when Qt is missing. + 2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Set HAVE_QT correctly. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index e5cb25e..d04619d 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -421,6 +421,7 @@ instead" >&AS_MESSAGE_LOG_FD if test x"$at_cv_qt_build" = xko; then AX_INSTEAD_IF([$4], [Cannot build a test Qt program]) + cd .. break fi QT_VERSION_MAJOR=`echo "$at_cv_qt_build" | sed 's/[[^0-9]]*//g'` @@ -447,6 +448,7 @@ instead" >&AS_MESSAGE_LOG_FD fi if test -f $at_mfile; then :; else AX_INSTEAD_IF([$4], [Cannot find the Makefile generated by qmake.]) + cd .. break fi -- 1.5.6.5

2 1

branch exp/scribo-z updated: last-svn-commit-230-g7b21118
by lazzara＠lrde.epita.fr 01 Jul '10

01 Jul '10

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 exp/scribo-z has been updated via 7b2111843120f318b696b1b79bd2e900a7eeac4b (commit) from 58e82cd9f7d25b6aafb2085c4ace86d1819b5e1f (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 ----------------------------------------------------------------- 7b21118 m4/autotroll.m4: Fix invalid configuration when Qt is missing. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ m4/autotroll.m4 | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-275-g1a16089 m4/autotroll.m4: Fix invalid configuration when Qt is missing.
by Guillaume Lazzara 01 Jul '10

01 Jul '10

--- ChangeLog | 4 ++++ m4/autotroll.m4 | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0b86a5..3123be9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/autotroll.m4: Fix invalid configuration when Qt is missing. + 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Check for Qt library using AutoTroll. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index e5cb25e..d04619d 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -421,6 +421,7 @@ instead" >&AS_MESSAGE_LOG_FD if test x"$at_cv_qt_build" = xko; then AX_INSTEAD_IF([$4], [Cannot build a test Qt program]) + cd .. break fi QT_VERSION_MAJOR=`echo "$at_cv_qt_build" | sed 's/[[^0-9]]*//g'` @@ -447,6 +448,7 @@ instead" >&AS_MESSAGE_LOG_FD fi if test -f $at_mfile; then :; else AX_INSTEAD_IF([$4], [Cannot find the Makefile generated by qmake.]) + cd .. break fi -- 1.5.6.5

1 0

last-svn-commit-194-g65586d1 Test clipart operators described by Millet on annoting database.
by green 30 Jun '10

30 Jun '10

* green/exp/annoting/nb_color: New experimentation directory. * green/exp/annoting/nb_color/Makefile.am: New Makefile. * green/exp/annoting/nb_color/nb_color.cc: New experementation. * green/exp/annoting/stddev_color: New experimentation directory. * green/exp/annoting/stddev_color/Makefile.am: New Makefile. * green/exp/annoting/stddev_color/stddev_color.cc: New experimentation. --- .../nb_color}/Makefile.am | 1 + .../green/exp/annoting/nb_color/nb_color.cc | 131 ++++++++++++++++++++ .../stddev_color}/Makefile.am | 1 + .../annoting/stddev_color/stddev_color.cc | 73 ++++++++---- 4 files changed, 184 insertions(+), 22 deletions(-) copy milena/sandbox/green/exp/{labeling/regional_maxima => annoting/nb_color}/Makefile.am (99%) create mode 100644 milena/sandbox/green/exp/annoting/nb_color/nb_color.cc copy milena/sandbox/green/exp/{labeling/regional_maxima => annoting/stddev_color}/Makefile.am (99%) copy milena/sandbox/green/{demo => exp}/annoting/stddev_color/stddev_color.cc (63%) diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am b/milena/sandbox/green/exp/annoting/nb_color/Makefile.am similarity index 99% copy from milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am copy to milena/sandbox/green/exp/annoting/nb_color/Makefile.am index ab76e18..8e204c6 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am +++ b/milena/sandbox/green/exp/annoting/nb_color/Makefile.am @@ -6,6 +6,7 @@ # TOOLS # ######### +LOADLIBES= -lboost_filesystem INCLUDES= -I$(HOME)/svn/oln/trunk/milena/sandbox/green #CXXFLAGS= -ggdb -O0 -Wall -W -pedantic -ansi -pipe $(INCLUDES) #CXXFLAGS= -DNDEBUG -O1 -Wall -W -pedantic -ansi -pipe $(INCLUDES) diff --git a/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc b/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc new file mode 100644 index 0000000..6dd9c26 --- /dev/null +++ b/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc @@ -0,0 +1,131 @@ +// COUNTING THE IMAGE COLORS + +#include <iostream> +#include <sstream> +#include <boost/filesystem.hpp> + +#include <mln/img_path.hh> + +#include <mln/accu/math/count.hh> +#include <mln/accu/stat/histo3d_rgb.hh> + +#include <mln/binarization/threshold.hh> + +#include <mln/core/alias/neighb3d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/compute.hh> +#include <mln/data/transform.hh> + +#include <mln/fun/v2v/rgb8_to_rgbn.hh> + +// #include <mln/morpho/opening/volume.hh> + +#include <mln/io/ppm/load.hh> + +#include <mln/pw/value.hh> +#include <mln/pw/cst.hh> + +#include <mln/util/timer.hh> + +#include <mln/value/rgb8.hh> +//#include <mln/value/rgb.hh> + +// FIXME +// Pour la classification des images, pour gagner du temps, +// peut être peut-on réduire toutes les images à 100x100 avec 2^5 couleurs ? + +// n < 8, n is the degree of quantification +template <unsigned n> +unsigned count_image_color(const std::string& image) +{ + typedef mln::value::rgb8 t_rgb8; + typedef mln::value::rgb<n> t_rgbn; + typedef mln::image2d<t_rgb8> t_image2d_rgb8; + typedef mln::image2d<t_rgbn> t_image2d_rgbn; + typedef mln::image3d<unsigned> t_histo3d; + typedef mln::image3d<bool> t_histo3d_bool; + typedef mln::fun::v2v::rgb8_to_rgbn<n> t_rgb8_to_rgbn; + typedef mln::accu::meta::stat::histo3d_rgb t_histo3d_fun; + typedef mln::accu::meta::math::count t_count_fun; + + t_image2d_rgb8 input_rgb8; + t_image2d_rgbn input_rgbn; + t_image2d_rgbn output_rgbn; + t_histo3d histo; +// t_histo3d opened; + t_histo3d_bool filtered; + + mln::io::ppm::load(input_rgb8, image.c_str()); + + unsigned nb_pixel = input_rgb8.ncols() * input_rgb8.nrows(); + unsigned min_volume = (unsigned)(nb_pixel * 0.0001); + unsigned nb_color = 0; + +// input_rgbn = mln::data::transform(input_rgb8, t_rgb8_to_rgbn()); + histo = mln::data::compute(t_histo3d_fun(), input_rgb8); +// opened = mln::morpho::opening::volume(histo, mln::c6(), min_volume); + filtered = mln::binarization::threshold(histo, min_volume); + nb_color = mln::data::compute(t_count_fun(), + (filtered|(mln::pw::value(filtered)!=0)).rw()); + + return nb_color; +} + +int main() +{ + typedef boost::filesystem::path t_path; + //typedef boost::filesystem::initial_path<t_path()> t_init_path; + typedef boost::filesystem::directory_iterator t_iter_path; + + t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), + t_path(ANNOTING_FAX_IMG_PATH), + t_path(ANNOTING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTING_LOGO_IMG_PATH), + t_path(ANNOTING_MAP_IMG_PATH), + t_path(ANNOTING_PHOTO_IMG_PATH), + t_path(ANNOTING_SCREENSHOT_IMG_PATH), + t_path(ANNOTING_SLIDE_IMG_PATH), + t_path(ANNOTING_TYPED_IMG_PATH)}; + + for (int i = 0; i < 9; ++i) + { + std::cerr << "entering " << full_path[i] << std::endl; + std::cout << "entering " << full_path[i] << std::endl; + + if (boost::filesystem::exists(full_path[i]) && + boost::filesystem::is_directory(full_path[i])) + { + boost::filesystem::system_complete(full_path[i]); + const t_iter_path end_iter; + unsigned count = 0; + unsigned sum1 = 0; + unsigned sum2 = 0; + + for (t_iter_path dir_iter(full_path[i]); end_iter != dir_iter; ++dir_iter) + { + unsigned val = count_image_color<8>(dir_iter->path().string()); + + ++count; + sum1 += val; + sum2 += val*val; + + std::cout << dir_iter->path().string() << " => " << val << std::endl; + // FIXME NB COULEURS BRUTES + // FIXME NB DE COULEURS + // FIXME LISTE DES COULEURS + // IMPORTANCES + } + + float mean = sum1 / count; + float var = ((float)sum2 / count) - (mean * mean); + + std::cout << "mean : " << mean << std::endl; + std::cout << "var : " << var << std::endl; + } + } + + return 0; +} diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am b/milena/sandbox/green/exp/annoting/stddev_color/Makefile.am similarity index 99% copy from milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am copy to milena/sandbox/green/exp/annoting/stddev_color/Makefile.am index ab76e18..8e204c6 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am +++ b/milena/sandbox/green/exp/annoting/stddev_color/Makefile.am @@ -6,6 +6,7 @@ # TOOLS # ######### +LOADLIBES= -lboost_filesystem INCLUDES= -I$(HOME)/svn/oln/trunk/milena/sandbox/green #CXXFLAGS= -ggdb -O0 -Wall -W -pedantic -ansi -pipe $(INCLUDES) #CXXFLAGS= -DNDEBUG -O1 -Wall -W -pedantic -ansi -pipe $(INCLUDES) diff --git a/milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc b/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc similarity index 63% copy from milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc copy to milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc index 0782e9c..652b8a8 100644 --- a/milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc +++ b/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc @@ -2,6 +2,7 @@ #include <iostream> #include <sstream> +#include <boost/filesystem.hpp> #include <mln/img_path.hh> @@ -11,9 +12,6 @@ #include <mln/core/macros.hh> #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image3d.hh> - -#include <mln/debug/println.hh> #include <mln/data/compute.hh> #include <mln/data/fill.hh> @@ -22,8 +20,6 @@ #include <mln/fun/v2v/rgb8_to_int_u8.hh> #include <mln/io/ppm/load.hh> -#include <mln/io/pgm/save.hh> -#include <mln/io/plot/save_image_sh.hh> #include <mln/math/sqr.hh> @@ -43,7 +39,7 @@ float r(short p, unsigned histo_p, short x, unsigned histo_x) return result; } -unsigned stddev_color(const std::string& image) +float stddev_color(const std::string& image) { typedef mln::point1d t_point1d; typedef mln::value::rgb8 t_rgb8; @@ -64,10 +60,6 @@ unsigned stddev_color(const std::string& image) input_int_u8 = mln::data::transform(input_rgb8, t_rgb8_to_int_u8()); histo = mln::data::compute(t_histo1d_fun(), input_int_u8); - mln::io::pgm::save(input_int_u8, "tmp.pgm"); - mln::io::plot::save_image_sh(histo, "histo.sh"); - mln::debug::println(histo); - // Find the peak of the histogram unsigned v_max = mln::opt::at(histo, 0); short p_max = 0; @@ -102,23 +94,60 @@ unsigned stddev_color(const std::string& image) stddev = (250 < p_max)? stddev_low : (5 > p_max)? stddev_up : (stddev_low + stddev_up)/2; - std::cout << "max_site : " << p_max << std::endl; - std::cout << "h(max_site) : " << v_max << std::endl; - std::cout << "stddev_up : " << stddev_up << std::endl; - std::cout << "stddev_low : " << stddev_low << std::endl; - std::cout << "stddev : " << stddev << std::endl; - - return 0; + return stddev; } - int main() { -// unsigned val = stdev_color(ANNOTING_PHOTO_IMG_PATH "/photo01.ppm"); - unsigned val = stddev_color(ANNOTING_LOGO_IMG_PATH "/logo06.ppm"); + typedef boost::filesystem::path t_path; + typedef boost::filesystem::directory_iterator t_iter_path; + + t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), + t_path(ANNOTING_FAX_IMG_PATH), + t_path(ANNOTING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTING_LOGO_IMG_PATH), + t_path(ANNOTING_MAP_IMG_PATH), + t_path(ANNOTING_PHOTO_IMG_PATH), + t_path(ANNOTING_SCREENSHOT_IMG_PATH), + t_path(ANNOTING_SLIDE_IMG_PATH), + t_path(ANNOTING_TYPED_IMG_PATH)}; + + for (int i = 0; i < 9; ++i) + { + std::cerr << "entering " << full_path[i] << std::endl; + std::cout << "entering " << full_path[i] << std::endl; -// std::cout << "nb color : " << val << std::endl; + if (boost::filesystem::exists(full_path[i]) && + boost::filesystem::is_directory(full_path[i])) + { + boost::filesystem::system_complete(full_path[i]); + const t_iter_path end_iter; + float count = 0; + float sum1 = 0; + float sum2 = 0; + + for (t_iter_path dir_iter(full_path[i]); end_iter != dir_iter; ++dir_iter) + { + float val = stddev_color(dir_iter->path().string()); + + ++count; + sum1 += val; + sum2 += val*val; + + std::cout << dir_iter->path().string() << " => " << val << std::endl; + // FIXME NB COULEURS BRUTES + // FIXME NB DE COULEURS + // FIXME LISTE DES COULEURS + // IMPORTANCES + } + + float mean = sum1 / count; + float var = ((float)sum2 / count) - (mean * mean); + + std::cout << "mean : " << mean << std::endl; + std::cout << "var : " << var << std::endl; + } + } return 0; } - -- 1.5.6.5

1 0

last-svn-commit-195-g5363092 2009-12-15 Yann Jacquelet <jacquelet@lrde.epita.fr>
by green 30 Jun '10

30 Jun '10

Work around the regional labeling chain and experiment it on the annoting database. * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. --- .../green/exp/labeling/regional_maxima/Makefile.am | 1 + .../labeling/regional_maxima/regional_maxima.cc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am b/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am index ab76e18..8e204c6 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am +++ b/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am @@ -6,6 +6,7 @@ # TOOLS # ######### +LOADLIBES= -lboost_filesystem INCLUDES= -I$(HOME)/svn/oln/trunk/milena/sandbox/green #CXXFLAGS= -ggdb -O0 -Wall -W -pedantic -ansi -pipe $(INCLUDES) #CXXFLAGS= -DNDEBUG -O1 -Wall -W -pedantic -ansi -pipe $(INCLUDES) diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc index 28b6b88..a66c1b7 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc +++ b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc @@ -98,10 +98,10 @@ unsigned count_image_color(const std::string& image) input_rgbn = mln::data::transform(input_rgb8, t_rgb8_to_rgbn()); // FIXME UTILISER UN PREDICAT COMME FUN::CHESS - histo = mln::data::compute(t_histo3d_fun(), input_rgbn | mln::pw::value(0)); -// return mln::data::compute(t_count_fun(), input_rgbn); + histo = mln::data::compute(t_histo3d_fun(), input_rgbn); + return mln::data::compute(t_count_fun(), histo); // FIXME REALISER UN COUNT AVEC UN PREDICA SUR L'IMAGE - return nb_pixel; + //return nb_pixel; // opened = mln::morpho::opening::volume(histo, mln::c6(), min_volume); // label = mln::labeling::regional_maxima(opened, mln::c6(), n_labels); -- 1.5.6.5

1 0

last-svn-commit-196-g00152b7 2009-12-15 green <jacquelet@lrde.epita.fr>
by green 30 Jun '10

30 Jun '10

Add new image paths to use the annoting database. * green/mln/img_path.hh: Update to LRDE norm and add annoting database. --- milena/sandbox/ChangeLog | 26 +++++++++++++++++ milena/sandbox/green/mln/img_path.hh | 52 +++++++++++++++++++++------------- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index ac48ee2..acb7027 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -75,6 +75,32 @@ * bin/pgm_to_pbm.cc, * bin/ppm_negate.cc: New. +2009-12-15 green <jacquelet(a)lrde.epita.fr> + + Add new image paths to use the annoting database. + + * green/mln/img_path.hh: Update to LRDE norm and add annoting database. + +2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work around the regional labeling chain and experiment it on the + annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. + * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. + +2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test clipart operators described by Millet on annoting database. + + * green/exp/annoting/nb_color: New experimentation directory. + * green/exp/annoting/nb_color/Makefile.am: New Makefile. + * green/exp/annoting/nb_color/nb_color.cc: New experementation. + + * green/exp/annoting/stddev_color: New experimentation directory. + * green/exp/annoting/stddev_color/Makefile.am: New Makefile. + * green/exp/annoting/stddev_color/stddev_color.cc: New experimentation. + 2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Introduce clipart operators described by Millet. diff --git a/milena/sandbox/green/mln/img_path.hh b/milena/sandbox/green/mln/img_path.hh index 188b813..04ff0c5 100644 --- a/milena/sandbox/green/mln/img_path.hh +++ b/milena/sandbox/green/mln/img_path.hh @@ -26,31 +26,43 @@ // executable file might be covered by the GNU General Public License. #ifndef MLN_IMG_PATH_HH -#define MLN_IMG_PATH_HH +# define MLN_IMG_PATH_HH -#define IMG_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/img" +# define IMG_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/img" +# define RESULT_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/result" -#define INIM_IMG_PATH IMG_PATH"/inim" -#define INIM_FG_BG_IMG_PATH INIM_IMG_PATH"/fg_bg" -#define INIM_IN_IMG_PATH INIM_IMG_PATH"/in" +# define INIM_IMG_PATH IMG_PATH"/inim" +# define INIM_FG_BG_IMG_PATH INIM_IMG_PATH"/fg_bg" +# define INIM_IN_IMG_PATH INIM_IMG_PATH"/in" -#define OLENA_IMG_PATH IMG_PATH"/olena" +# define OLENA_IMG_PATH IMG_PATH"/olena" -#define SCRIBO_IMG_PATH IMG_PATH"/scribo" -#define SCRIBO_JPG_IMG_PATH SCRIBO_IMG_PATH"/jpg_50p" -#define SCRIBO_PGM_IMG_PATH SCRIBO_IMG_PATH"/pgm_50p" -#define SCRIBO_PPM_IMG_PATH SCRIBO_IMG_PATH"/ppm_50p" - -#define ANNOTING_IMG_PATH IMG_PATH"/annoting" -#define ANNOTING_BILL_IMG_PATH ANNOTING_IMG_PATH"/bill" -#define ANNOTING_FAX_IMG_PATH ANNOTING_IMG_PATH"/fax" -#define ANNOTING_HANDWRITTEN_IMG_PATH ANNOTING_IMG_PATH"/handwritten" -#define ANNOTING_LOGO_IMG_PATH ANNOTING_IMG_PATH"/logo" -#define ANNOTING_MAP_IMG_PATH ANNOTING_IMG_PATH"/map" -#define ANNOTING_SCREENSHOT_IMG_PATH ANNOTING_IMG_PATH"/screenshot" -#define ANNOTING_SLIDE_IMG_PATH ANNOTING_IMG_PATH"/slide" -#define ANNOTING_TYPED_IMG_PATH ANNOTING_IMG_PATH"/typed" +# define SCRIBO_IMG_PATH IMG_PATH"/scribo" +# define SCRIBO_JPG_IMG_PATH SCRIBO_IMG_PATH"/jpg_50p" +# define SCRIBO_PGM_IMG_PATH SCRIBO_IMG_PATH"/pgm_50p" +# define SCRIBO_PPM_IMG_PATH SCRIBO_IMG_PATH"/ppm_50p" +# define ANNOTING_IMG_PATH IMG_PATH"/annoting" +# define ANNOTING_BILL_IMG_PATH ANNOTING_IMG_PATH"/bill" +# define ANNOTING_FAX_IMG_PATH ANNOTING_IMG_PATH"/fax" +# define ANNOTING_HANDWRITTEN_IMG_PATH ANNOTING_IMG_PATH"/handwritten" +# define ANNOTING_LOGO_IMG_PATH ANNOTING_IMG_PATH"/logo" +# define ANNOTING_MAP_IMG_PATH ANNOTING_IMG_PATH"/map" +# define ANNOTING_SCREENSHOT_IMG_PATH ANNOTING_IMG_PATH"/screenshot" +# define ANNOTING_SLIDE_IMG_PATH ANNOTING_IMG_PATH"/slide" +# define ANNOTING_TYPED_IMG_PATH ANNOTING_IMG_PATH"/typed" +# define ANNOTING_PHOTO_IMG_PATH ANNOTING_IMG_PATH"/photo" +// result directories +# define RESULT_ANNOTING_PATH RESULT_PATH"/annoting" +# define RESULT_ANNOTING_BILL_PATH RESULT_ANNOTING_PATH"/bill" +# define RESULT_ANNOTING_FAX_PATH RESULT_ANNOTING_PATH"/fax" +# define RESULT_ANNOTING_HANDWRITTEN_PATH RESULT_ANNOTING_PATH"/handwritten" +# define RESULT_ANNOTING_LOGO_PATH RESULT_ANNOTING_PATH"/logo" +# define RESULT_ANNOTING_MAP_PATH RESULT_ANNOTING_PATH"/map" +# define RESULT_ANNOTING_SCREENSHOT_PATH RESULT_ANNOTING_PATH"/screenshot" +# define RESULT_ANNOTING_SLIDE_PATH RESULT_ANNOTING_PATH"/slide" +# define RESULT_ANNOTING_TYPED_PATH RESULT_ANNOTING_PATH"/typed" +# define RESULT_ANNOTING_PHOTO_PATH RESULT_ANNOTING_PATH"/photo" #endif // ! MLN_IMG_PATH_HH -- 1.5.6.5

1 0

last-svn-commit-197-g34bcc24 2009-12-15 green <jacquelet@lrde.epita.fr>
by green 30 Jun '10

30 Jun '10

Introduce new image converter from color to greyscale. * green/mln/fun/v2v/rgb8_to_int_u8.hh: New image converter. --- milena/sandbox/ChangeLog | 6 ++++++ .../sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 0 2 files changed, 6 insertions(+), 0 deletions(-) copy {scribo => milena}/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh (100%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index acb7027..c928ab7 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -77,6 +77,12 @@ 2009-12-15 green <jacquelet(a)lrde.epita.fr> + Introduce new image converter from color to greyscale. + + * green/mln/fun/v2v/rgb8_to_int_u8.hh: New image converter. + +2009-12-15 green <jacquelet(a)lrde.epita.fr> + Add new image paths to use the annoting database. * green/mln/img_path.hh: Update to LRDE norm and add annoting database. diff --git a/scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh b/milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh similarity index 100% copy from scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh copy to milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh -- 1.5.6.5

1 0

last-svn-commit-198-gf8c67ca Correct typo into directories.
by green 30 Jun '10

30 Jun '10

* green/demo/annoting: Rename as ... * green/demo/annotating: ... these. * green/exp/annoting: Rename as ... * green/exp/annotating: ... these. * green/mln/img_path.hh: Propagate mistake corrections. * green/exp/labeling/regional_maxima/regional_maxima.cc (main): Rename ANNOTING macro references as ANNOTATING ones. * green/exp/annotating/stddev_color/stddev_color (main): Rename ANNOTING macro references as ANNOTATING ones. * green/exp/annotating/nb_color/nb_color.cc (main): Rename ANNOTING macro references as ANNOTATING ones. --- milena/sandbox/ChangeLog | 21 ++++++++++ .../demo/{annoting => annotating}/bic/Makefile.am | 0 .../green/demo/{annoting => annotating}/bic/bic.cc | 0 .../green/demo/{annoting => annotating}/class.txt | 0 .../demo/{annoting => annotating}/lep/Makefile.am | 0 .../green/demo/{annoting => annotating}/lep/lep.cc | 0 .../{annoting => annotating}/nb_color/Makefile.am | 0 .../{annoting => annotating}/nb_color/nb_color.cc | 0 .../{annoting => annotating}/project/Makefile.am | 0 .../{annoting => annotating}/project/project.cc | 0 .../{annoting => annotating}/rgb_64/Makefile.am | 0 .../demo/{annoting => annotating}/rgb_64/rgb_64.cc | 0 .../{annoting => annotating}/rgb_64_9/Makefile.am | 0 .../{annoting => annotating}/rgb_64_9/rgb_64_9.cc | 0 .../stddev_color/Makefile.am | 0 .../stddev_color/stddev_color.cc | 0 .../{annoting => annotating}/nb_color/Makefile.am | 0 .../{annoting => annotating}/nb_color/nb_color.cc | 18 ++++---- .../stddev_color/Makefile.am | 0 .../stddev_color/stddev_color.cc | 18 ++++---- .../labeling/regional_maxima/regional_maxima.cc | 2 +- milena/sandbox/green/mln/img_path.hh | 40 ++++++++++---------- 22 files changed, 60 insertions(+), 39 deletions(-) rename milena/sandbox/green/demo/{annoting => annotating}/bic/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/bic/bic.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/class.txt (100%) rename milena/sandbox/green/demo/{annoting => annotating}/lep/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/lep/lep.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/nb_color/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/nb_color/nb_color.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/project/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/project/project.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64/rgb_64.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64_9/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64_9/rgb_64_9.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/stddev_color/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/stddev_color/stddev_color.cc (100%) rename milena/sandbox/green/exp/{annoting => annotating}/nb_color/Makefile.am (100%) rename milena/sandbox/green/exp/{annoting => annotating}/nb_color/nb_color.cc (91%) rename milena/sandbox/green/exp/{annoting => annotating}/stddev_color/Makefile.am (100%) rename milena/sandbox/green/exp/{annoting => annotating}/stddev_color/stddev_color.cc (91%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index c928ab7..6435445 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -75,6 +75,27 @@ * bin/pgm_to_pbm.cc, * bin/ppm_negate.cc: New. +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Correct typo into directories. + + * green/demo/annoting: Rename as ... + * green/demo/annotating: ... these. + + * green/exp/annoting: Rename as ... + * green/exp/annotating: ... these. + + * green/mln/img_path.hh: Propagate mistake corrections. + + * green/exp/labeling/regional_maxima/regional_maxima.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/stddev_color/stddev_color (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/nb_color/nb_color.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + 2009-12-15 green <jacquelet(a)lrde.epita.fr> Introduce new image converter from color to greyscale. diff --git a/milena/sandbox/green/demo/annoting/bic/Makefile.am b/milena/sandbox/green/demo/annotating/bic/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/bic/Makefile.am rename to milena/sandbox/green/demo/annotating/bic/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/bic/bic.cc b/milena/sandbox/green/demo/annotating/bic/bic.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/bic/bic.cc rename to milena/sandbox/green/demo/annotating/bic/bic.cc diff --git a/milena/sandbox/green/demo/annoting/class.txt b/milena/sandbox/green/demo/annotating/class.txt similarity index 100% rename from milena/sandbox/green/demo/annoting/class.txt rename to milena/sandbox/green/demo/annotating/class.txt diff --git a/milena/sandbox/green/demo/annoting/lep/Makefile.am b/milena/sandbox/green/demo/annotating/lep/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/lep/Makefile.am rename to milena/sandbox/green/demo/annotating/lep/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/lep/lep.cc b/milena/sandbox/green/demo/annotating/lep/lep.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/lep/lep.cc rename to milena/sandbox/green/demo/annotating/lep/lep.cc diff --git a/milena/sandbox/green/demo/annoting/nb_color/Makefile.am b/milena/sandbox/green/demo/annotating/nb_color/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/nb_color/Makefile.am rename to milena/sandbox/green/demo/annotating/nb_color/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/nb_color/nb_color.cc b/milena/sandbox/green/demo/annotating/nb_color/nb_color.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/nb_color/nb_color.cc rename to milena/sandbox/green/demo/annotating/nb_color/nb_color.cc diff --git a/milena/sandbox/green/demo/annoting/project/Makefile.am b/milena/sandbox/green/demo/annotating/project/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/project/Makefile.am rename to milena/sandbox/green/demo/annotating/project/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/project/project.cc b/milena/sandbox/green/demo/annotating/project/project.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/project/project.cc rename to milena/sandbox/green/demo/annotating/project/project.cc diff --git a/milena/sandbox/green/demo/annoting/rgb_64/Makefile.am b/milena/sandbox/green/demo/annotating/rgb_64/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64/Makefile.am rename to milena/sandbox/green/demo/annotating/rgb_64/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/rgb_64/rgb_64.cc b/milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64/rgb_64.cc rename to milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc diff --git a/milena/sandbox/green/demo/annoting/rgb_64_9/Makefile.am b/milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64_9/Makefile.am rename to milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/rgb_64_9/rgb_64_9.cc b/milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64_9/rgb_64_9.cc rename to milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc diff --git a/milena/sandbox/green/demo/annoting/stddev_color/Makefile.am b/milena/sandbox/green/demo/annotating/stddev_color/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/stddev_color/Makefile.am rename to milena/sandbox/green/demo/annotating/stddev_color/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc b/milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc rename to milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc diff --git a/milena/sandbox/green/exp/annoting/nb_color/Makefile.am b/milena/sandbox/green/exp/annotating/nb_color/Makefile.am similarity index 100% rename from milena/sandbox/green/exp/annoting/nb_color/Makefile.am rename to milena/sandbox/green/exp/annotating/nb_color/Makefile.am diff --git a/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc b/milena/sandbox/green/exp/annotating/nb_color/nb_color.cc similarity index 91% rename from milena/sandbox/green/exp/annoting/nb_color/nb_color.cc rename to milena/sandbox/green/exp/annotating/nb_color/nb_color.cc index 6dd9c26..e46c8c2 100644 --- a/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc +++ b/milena/sandbox/green/exp/annotating/nb_color/nb_color.cc @@ -80,15 +80,15 @@ int main() //typedef boost::filesystem::initial_path<t_path()> t_init_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), - t_path(ANNOTING_FAX_IMG_PATH), - t_path(ANNOTING_HANDWRITTEN_IMG_PATH), - t_path(ANNOTING_LOGO_IMG_PATH), - t_path(ANNOTING_MAP_IMG_PATH), - t_path(ANNOTING_PHOTO_IMG_PATH), - t_path(ANNOTING_SCREENSHOT_IMG_PATH), - t_path(ANNOTING_SLIDE_IMG_PATH), - t_path(ANNOTING_TYPED_IMG_PATH)}; + t_path full_path[] = {t_path(ANNOTATING_BILL_IMG_PATH), + t_path(ANNOTATING_FAX_IMG_PATH), + t_path(ANNOTATING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTATING_LOGO_IMG_PATH), + t_path(ANNOTATING_MAP_IMG_PATH), + t_path(ANNOTATING_PHOTO_IMG_PATH), + t_path(ANNOTATING_SCREENSHOT_IMG_PATH), + t_path(ANNOTATING_SLIDE_IMG_PATH), + t_path(ANNOTATING_TYPED_IMG_PATH)}; for (int i = 0; i < 9; ++i) { diff --git a/milena/sandbox/green/exp/annoting/stddev_color/Makefile.am b/milena/sandbox/green/exp/annotating/stddev_color/Makefile.am similarity index 100% rename from milena/sandbox/green/exp/annoting/stddev_color/Makefile.am rename to milena/sandbox/green/exp/annotating/stddev_color/Makefile.am diff --git a/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc b/milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc similarity index 91% rename from milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc rename to milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc index 652b8a8..aee3c5d 100644 --- a/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc +++ b/milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc @@ -102,15 +102,15 @@ int main() typedef boost::filesystem::path t_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), - t_path(ANNOTING_FAX_IMG_PATH), - t_path(ANNOTING_HANDWRITTEN_IMG_PATH), - t_path(ANNOTING_LOGO_IMG_PATH), - t_path(ANNOTING_MAP_IMG_PATH), - t_path(ANNOTING_PHOTO_IMG_PATH), - t_path(ANNOTING_SCREENSHOT_IMG_PATH), - t_path(ANNOTING_SLIDE_IMG_PATH), - t_path(ANNOTING_TYPED_IMG_PATH)}; + t_path full_path[] = {t_path(ANNOTATING_BILL_IMG_PATH), + t_path(ANNOTATING_FAX_IMG_PATH), + t_path(ANNOTATING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTATING_LOGO_IMG_PATH), + t_path(ANNOTATING_MAP_IMG_PATH), + t_path(ANNOTATING_PHOTO_IMG_PATH), + t_path(ANNOTATING_SCREENSHOT_IMG_PATH), + t_path(ANNOTATING_SLIDE_IMG_PATH), + t_path(ANNOTATING_TYPED_IMG_PATH)}; for (int i = 0; i < 9; ++i) { diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc index a66c1b7..69fabd0 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc +++ b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc @@ -115,7 +115,7 @@ int main() //typedef boost::filesystem::initial_path<t_path()> t_init_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path(ANNOTING_TYPED_IMG_PATH); + t_path full_path(ANNOTATING_TYPED_IMG_PATH); std::cout << "entering " << full_path << std::endl; diff --git a/milena/sandbox/green/mln/img_path.hh b/milena/sandbox/green/mln/img_path.hh index 04ff0c5..7368c22 100644 --- a/milena/sandbox/green/mln/img_path.hh +++ b/milena/sandbox/green/mln/img_path.hh @@ -42,27 +42,27 @@ # define SCRIBO_PGM_IMG_PATH SCRIBO_IMG_PATH"/pgm_50p" # define SCRIBO_PPM_IMG_PATH SCRIBO_IMG_PATH"/ppm_50p" -# define ANNOTING_IMG_PATH IMG_PATH"/annoting" -# define ANNOTING_BILL_IMG_PATH ANNOTING_IMG_PATH"/bill" -# define ANNOTING_FAX_IMG_PATH ANNOTING_IMG_PATH"/fax" -# define ANNOTING_HANDWRITTEN_IMG_PATH ANNOTING_IMG_PATH"/handwritten" -# define ANNOTING_LOGO_IMG_PATH ANNOTING_IMG_PATH"/logo" -# define ANNOTING_MAP_IMG_PATH ANNOTING_IMG_PATH"/map" -# define ANNOTING_SCREENSHOT_IMG_PATH ANNOTING_IMG_PATH"/screenshot" -# define ANNOTING_SLIDE_IMG_PATH ANNOTING_IMG_PATH"/slide" -# define ANNOTING_TYPED_IMG_PATH ANNOTING_IMG_PATH"/typed" -# define ANNOTING_PHOTO_IMG_PATH ANNOTING_IMG_PATH"/photo" +# define ANNOTATING_IMG_PATH IMG_PATH"/annotating" +# define ANNOTATING_BILL_IMG_PATH ANNOTATING_IMG_PATH"/bill" +# define ANNOTATING_FAX_IMG_PATH ANNOTATING_IMG_PATH"/fax" +# define ANNOTATING_HANDWRITTEN_IMG_PATH ANNOTATING_IMG_PATH"/handwritten" +# define ANNOTATING_LOGO_IMG_PATH ANNOTATING_IMG_PATH"/logo" +# define ANNOTATING_MAP_IMG_PATH ANNOTATING_IMG_PATH"/map" +# define ANNOTATING_SCREENSHOT_IMG_PATH ANNOTATING_IMG_PATH"/screenshot" +# define ANNOTATING_SLIDE_IMG_PATH ANNOTATING_IMG_PATH"/slide" +# define ANNOTATING_TYPED_IMG_PATH ANNOTATING_IMG_PATH"/typed" +# define ANNOTATING_PHOTO_IMG_PATH ANNOTATING_IMG_PATH"/photo" // result directories -# define RESULT_ANNOTING_PATH RESULT_PATH"/annoting" -# define RESULT_ANNOTING_BILL_PATH RESULT_ANNOTING_PATH"/bill" -# define RESULT_ANNOTING_FAX_PATH RESULT_ANNOTING_PATH"/fax" -# define RESULT_ANNOTING_HANDWRITTEN_PATH RESULT_ANNOTING_PATH"/handwritten" -# define RESULT_ANNOTING_LOGO_PATH RESULT_ANNOTING_PATH"/logo" -# define RESULT_ANNOTING_MAP_PATH RESULT_ANNOTING_PATH"/map" -# define RESULT_ANNOTING_SCREENSHOT_PATH RESULT_ANNOTING_PATH"/screenshot" -# define RESULT_ANNOTING_SLIDE_PATH RESULT_ANNOTING_PATH"/slide" -# define RESULT_ANNOTING_TYPED_PATH RESULT_ANNOTING_PATH"/typed" -# define RESULT_ANNOTING_PHOTO_PATH RESULT_ANNOTING_PATH"/photo" +# define RESULT_ANNOTATING_PATH RESULT_PATH"/annotating" +# define RESULT_ANNOTATING_BILL_PATH RESULT_ANNOTATING_PATH"/bill" +# define RESULT_ANNOTATING_FAX_PATH RESULT_ANNOTATING_PATH"/fax" +# define RESULT_ANNOTATING_HANDWRITTEN_PATH RESULT_ANNOTATING_PATH"/handwritten" +# define RESULT_ANNOTATING_LOGO_PATH RESULT_ANNOTATING_PATH"/logo" +# define RESULT_ANNOTATING_MAP_PATH RESULT_ANNOTATING_PATH"/map" +# define RESULT_ANNOTATING_SCREENSHOT_PATH RESULT_ANNOTATING_PATH"/screenshot" +# define RESULT_ANNOTATING_SLIDE_PATH RESULT_ANNOTATING_PATH"/slide" +# define RESULT_ANNOTATING_TYPED_PATH RESULT_ANNOTATING_PATH"/typed" +# define RESULT_ANNOTATING_PHOTO_PATH RESULT_ANNOTATING_PATH"/photo" #endif // ! MLN_IMG_PATH_HH -- 1.5.6.5

1 0