[Olena-patches] olena-2.0-396-g3164abc Remove last references to mln::trace::*.

* mln/arith/min.hh, * mln/clustering/kmean_rgb.hh, * mln/world/rgb/invert.spe.hh: Remove duplicate references to mln_trace. * tests/data/fill_with_image.cc, * tests/data/paste.cc, * tests/linear/gaussian.cc, * tests/opt/at.cc, * tests/opt/element.cc, * tests/opt/value.cc: Remove useless include. * tests/unit_test/unit-tests.mk: Remove mln_trace_* tests. --- milena/ChangeLog | 18 ++++++++++++++++++ milena/mln/arith/min.hh | 5 ++--- milena/mln/clustering/kmean_rgb.hh | 7 ------- milena/mln/world/rgb/invert.spe.hh | 4 ++-- milena/tests/data/fill_with_image.cc | 4 ++-- milena/tests/data/paste.cc | 4 ++-- milena/tests/linear/gaussian.cc | 6 ++---- milena/tests/opt/at.cc | 4 ++-- milena/tests/opt/element.cc | 4 ++-- milena/tests/opt/value.cc | 5 ++--- milena/tests/unit_test/unit-tests.mk | 8 -------- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ecc35ee..39d46b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2013-03-19 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Remove last references to mln::trace::*. + + * mln/arith/min.hh, + * mln/clustering/kmean_rgb.hh, + * mln/world/rgb/invert.spe.hh: Remove duplicate references to + mln_trace. + + * tests/data/fill_with_image.cc, + * tests/data/paste.cc, + * tests/linear/gaussian.cc, + * tests/opt/at.cc, + * tests/opt/element.cc, + * tests/opt/value.cc: Remove useless include. + + * tests/unit_test/unit-tests.mk: Remove mln_trace_* tests. + 2013-03-18 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Remove deprecated trace system. diff --git a/milena/mln/arith/min.hh b/milena/mln/arith/min.hh index cb2c165..4a6706e 100644 --- a/milena/mln/arith/min.hh +++ b/milena/mln/arith/min.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -82,8 +83,6 @@ namespace mln mln_piter(L) p(lhs.domain()); for_all(p) output(p) = lhs(p) < rhs(p) ? lhs(p) : rhs(p); - - mln_trace("data::arith::generic::min_"); } template <typename L, typename R> diff --git a/milena/mln/clustering/kmean_rgb.hh b/milena/mln/clustering/kmean_rgb.hh index 18265ae..f030040 100644 --- a/milena/mln/clustering/kmean_rgb.hh +++ b/milena/mln/clustering/kmean_rgb.hh @@ -698,14 +698,12 @@ namespace mln while (_current_launching < _n_times) { // BEGIN LAUNCH ONE TIME - mln_trace("Launch one time"); { t_result1d old_variance = mln_max(t_result1d); _within_variance = mln_max(t_result1d); _current_step = 0; // BEGIN INIT_MEAN - mln_trace("init mean"); { t_value_comp0 min_comp0 = mln_min(t_value_comp0); t_value_comp0 max_comp0 = mln_max(t_value_comp0); @@ -726,7 +724,6 @@ namespace mln // UPDATE DISTANCE - mln_trace("update distance"); for (unsigned i = 0; i < _k_center; ++i) { @@ -754,7 +751,6 @@ namespace mln old_variance = _within_variance; // BEGIN UPDATE GROUP - mln_trace("update group"); { mln_piter(t_group_img) rgb(_group.domain()); @@ -780,7 +776,6 @@ namespace mln // END UPDATE GROUP // BEGIN UPDATE MEAN - mln_trace("update mean"); { mln_eiter(t_number_img) en(_number); mln_eiter(t_mean_img) em(_mean); @@ -821,7 +816,6 @@ namespace mln break; // UPDATE DISTANCE - mln_trace("update distance"); for (unsigned i = 0; i < _k_center; ++i) { @@ -840,7 +834,6 @@ namespace mln // END UPDATE DISTANCE // BEGIN UPDATE VARIANCE - mln_trace("update variance"); { _within_variance = literal::zero; mln_eiter(t_variance_img) l(_variance); diff --git a/milena/mln/world/rgb/invert.spe.hh b/milena/mln/world/rgb/invert.spe.hh index a63c996..27d87c4 100644 --- a/milena/mln/world/rgb/invert.spe.hh +++ b/milena/mln/world/rgb/invert.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -78,7 +79,6 @@ namespace mln op.val().blue() = mln_min(Blue) + (mln_max(Blue) - ip.val().blue()); } - mln_trace("world::rgb::impl::invert_rgb_fastest"); } diff --git a/milena/tests/data/fill_with_image.cc b/milena/tests/data/fill_with_image.cc index b995ee9..2fd8e30 100644 --- a/milena/tests/data/fill_with_image.cc +++ b/milena/tests/data/fill_with_image.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/data/paste.cc b/milena/tests/data/paste.cc index e4b1828..b79fd4d 100644 --- a/milena/tests/data/paste.cc +++ b/milena/tests/data/paste.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/linear/gaussian.cc b/milena/tests/linear/gaussian.cc index e18959e..7862fc2 100644 --- a/milena/tests/linear/gaussian.cc +++ b/milena/tests/linear/gaussian.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -39,8 +39,6 @@ #include "tests/data.hh" -#include <mln/trace/all.hh> - int main() diff --git a/milena/tests/opt/at.cc b/milena/tests/opt/at.cc index 549ab3d..73d573e 100644 --- a/milena/tests/opt/at.cc +++ b/milena/tests/opt/at.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/opt/element.cc b/milena/tests/opt/element.cc index 2236d45..aa2355f 100644 --- a/milena/tests/opt/element.cc +++ b/milena/tests/opt/element.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -25,7 +26,6 @@ #include <mln/opt/element.hh> #include <mln/core/image/image2d.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/opt/value.cc b/milena/tests/opt/value.cc index ba044fa..8324b1a 100644 --- a/milena/tests/opt/value.cc +++ b/milena/tests/opt/value.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -27,8 +28,6 @@ #include <mln/core/image/flat_image.hh> #include <mln/core/alias/box2d.hh> -#include <mln/trace/all.hh> - int main() { diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 1817969..fe36139 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1109,14 +1109,6 @@ mln_topo_skeleton_breadth_first_thinning \ mln_topo_skeleton_crest \ mln_topo_skeleton_is_simple_point \ mln_topo_static_n_face_iter \ -mln_trace_all \ -mln_trace_entering \ -mln_trace_essential \ -mln_trace_exiting \ -mln_trace_quiet \ -mln_trace_resume \ -mln_trace_stop \ -mln_trace_warning \ mln_trait_accumulator_print \ mln_trait_accumulator_props \ mln_trait_accumulators \ -- 1.7.2.5