[Olena-patches] olena: olena-2.0-644-g3124478 Remove Milena debug code making side effects on streams.

* mln/accu/stat/median_alt.hh, * mln/canvas/browsing/dir_struct_elt_incr_update.hh, * mln/core/image/image2d.hh, * mln/core/internal/classical_window_base.hh, * mln/core/internal/image_morpher.hh, * mln/io/raw/load.hh, * mln/morpho/tree/data.hh, * mln/morpho/tree/impl/dual_hqueue.hh, * mln/morpho/tree/impl/dual_union_find.hh, * mln/morpho/watershed/topological.hh, * mln/util/edge.hh, * mln/util/timer.hh: Here. --- milena/ChangeLog | 18 ++++++++++++ milena/mln/accu/stat/median_alt.hh | 14 +-------- .../canvas/browsing/dir_struct_elt_incr_update.hh | 31 ++++---------------- milena/mln/core/image/image2d.hh | 5 ---- milena/mln/core/internal/classical_window_base.hh | 1 - milena/mln/core/internal/image_morpher.hh | 1 - milena/mln/io/raw/load.hh | 3 +- milena/mln/morpho/tree/data.hh | 10 +------ milena/mln/morpho/tree/impl/dual_hqueue.hh | 5 ++-- milena/mln/morpho/tree/impl/dual_union_find.hh | 13 ++------ milena/mln/morpho/watershed/topological.hh | 4 --- milena/mln/util/edge.hh | 3 +- milena/mln/util/timer.hh | 9 ------ 13 files changed, 32 insertions(+), 85 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2d70c85..ef4a090 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2013-08-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Remove Milena debug code making side effects on streams. + + * mln/accu/stat/median_alt.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/core/image/image2d.hh, + * mln/core/internal/classical_window_base.hh, + * mln/core/internal/image_morpher.hh, + * mln/io/raw/load.hh, + * mln/morpho/tree/data.hh, + * mln/morpho/tree/impl/dual_hqueue.hh, + * mln/morpho/tree/impl/dual_union_find.hh, + * mln/morpho/watershed/topological.hh, + * mln/util/edge.hh, + * mln/util/timer.hh: + Here. + 2010-03-22 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Remove old tools from doc/. diff --git a/milena/mln/accu/stat/median_alt.hh b/milena/mln/accu/stat/median_alt.hh index e22d4d6..df42b4f 100644 --- a/milena/mln/accu/stat/median_alt.hh +++ b/milena/mln/accu/stat/median_alt.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -71,15 +71,6 @@ namespace mln /// Always true here. bool is_valid() const; - // FIXME: remove - void debug__() const - { - std::cout << " i = " << i_ - << " t = " << t_ - << " s = " << sum_minus_ << " ; " << h_[i_] << " ; " << sum_plus_ << " = " << h_.sum() - << std::endl; - } - protected: histo<S> h_; @@ -171,7 +162,6 @@ namespace mln // current state was initialization if (h_[i_] == 0) { - // std::cout << "init!" << std::endl; i_ = s_.index_of(t); t_ = t; return; @@ -181,7 +171,6 @@ namespace mln // the median does not change if (t == t_) { - // std::cout << "no change!" << std::endl; return; } @@ -323,7 +312,6 @@ namespace mln inline std::ostream& operator<<(std::ostream& ostr, const median_alt<S>& m) { - m.debug__(); return ostr << m.to_result(); } diff --git a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh index cddd1c4..60b580a 100644 --- a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh +++ b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -148,53 +148,34 @@ namespace mln f.init_line(); // initialization (before first point of the line) - std::cout << "init" << std::endl; for (ct = pmin_dir; ct < pmin_dir_plus_half_length; ++ ct) if (f.input.has(pt)) - { - std::cout << '+' << pt << ' '; - f.add_point(pt); - } + f.add_point(pt); // left columns (just take new points) - std::cout << "left" << std::endl; for (p_dir = pmin_dir; p_dir <= pmin_dir_plus_half_length; ++p_dir, ++ct) { if (f.input.has(pt)) - { - std::cout << '+' << pt << ' '; - f.add_point(pt); - } + f.add_point(pt); f.next(); } // middle columns (both take and untake) - std::cout << "middle" << std::endl; cu = pmin_dir; for (; p_dir <= pmax_dir_minus_half_length; ++cu, ++p_dir, ++ct) { if (f.input.has(pt)) - { - std::cout << '+' << pt << ' '; - f.add_point(pt); - } + f.add_point(pt); if (f.input.has(pu)) - { - std::cout << '-' << pu << ' '; - f.remove_point(pu); - } + f.remove_point(pu); f.next(); } // right columns (now just untake old points) - std::cout << "right" << std::endl; for (; p_dir <= pmax_dir; ++cu, ++p_dir) { if (f.input.has(pu)) - { - std::cout << '-' << pu << ' '; - f.remove_point(pu); - } + f.remove_point(pu); f.next(); } diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index 7ef0102..2892868 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -193,11 +193,6 @@ namespace mln typedef def::coord coord_t; mln_precondition(this->has(p)); -// std::cout << (coord_t*)(&p.p_hook_()) << ' ' -// << &(p.row()) << ' ' -// << &(p.get_subject()) << ' ' -// << &(p.to_site()) << std::endl; - // return this->data_->array_[p.to_site().row()][p.to_site().col()]; // return this->data_->array_[p.row()][p.col()]; // return this->data_->array_[p.get_subject().row()][p.get_subject().col()]; diff --git a/milena/mln/core/internal/classical_window_base.hh b/milena/mln/core/internal/classical_window_base.hh index 887a908..c55ba50 100644 --- a/milena/mln/core/internal/classical_window_base.hh +++ b/milena/mln/core/internal/classical_window_base.hh @@ -179,7 +179,6 @@ namespace mln { // void *v = (void*)(& classical_window_base<D,E>::delta_); // void *w = (void*)(& E::delta_); - // std::cout << v << ' ' << w << std::endl; return exact(this)->delta_(); } diff --git a/milena/mln/core/internal/image_morpher.hh b/milena/mln/core/internal/image_morpher.hh index c16165c..dce58cd 100644 --- a/milena/mln/core/internal/image_morpher.hh +++ b/milena/mln/core/internal/image_morpher.hh @@ -202,7 +202,6 @@ namespace mln // void init_(Subject s, T& target, // const internal::image_morpher<I,S,E>& model) // { -// std::cout << "deleg... "; // // FIXME: Precondition. // init_(s, target, * model.delegatee_()); // } diff --git a/milena/mln/io/raw/load.hh b/milena/mln/io/raw/load.hh index a91d6ee..624a64c 100644 --- a/milena/mln/io/raw/load.hh +++ b/milena/mln/io/raw/load.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2012 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2012, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -151,7 +151,6 @@ namespace mln info_file.read(dev_null, 14); P pmax; read_point<P>(info_file, pmax); - std::cout << pmax << std::endl; // Initialize the image buffer. mln_concrete(I) result(box<P>(pmin, pmax)); diff --git a/milena/mln/morpho/tree/data.hh b/milena/mln/morpho/tree/data.hh index 0bf9d5f..ac0d262 100644 --- a/milena/mln/morpho/tree/data.hh +++ b/milena/mln/morpho/tree/data.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -689,18 +689,10 @@ namespace mln return; // mln_invariant(p_.is_valid()); - // std::cout << "children(p).size = " << s_->children(p_).nsites() << std::endl; - // if (s_->children(p_).nsites() != 0) - // { - // std::cout << "elt[0] = " << s_->children(p_)[0].to_site().graph().data_hook_() << std::endl; - // std::cout << "elt[0] = " << s_->children(p_)[0] << std::endl; - // } - // std::cout << s_->children(p_) << std::endl; mln_fwd_piter(T::nodes_t) child(s_->children(p_)); for_all(child) { - // std::cout << child.to_site().graph().data_hook_() << std::endl; // mln_invariant(s_->parent(child) == p_); stack_.push_back(child); } diff --git a/milena/mln/morpho/tree/impl/dual_hqueue.hh b/milena/mln/morpho/tree/impl/dual_hqueue.hh index ed07aa3..bd892eb 100644 --- a/milena/mln/morpho/tree/impl/dual_hqueue.hh +++ b/milena/mln/morpho/tree/impl/dual_hqueue.hh @@ -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. // @@ -383,8 +384,6 @@ namespace mln } - std::cout << "Construction de l'arbre en " << tm << " s." << std::endl; - data<I, S> tree(fext, parent, s); diff --git a/milena/mln/morpho/tree/impl/dual_union_find.hh b/milena/mln/morpho/tree/impl/dual_union_find.hh index cdb5ab8..fb80aac 100644 --- a/milena/mln/morpho/tree/impl/dual_union_find.hh +++ b/milena/mln/morpho/tree/impl/dual_union_find.hh @@ -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. // @@ -250,12 +251,6 @@ namespace mln P p = it; P ext = p + dp; - // std::cout << "-------------------" << std::endl; - // std::cout << "Take " << p << " of value " << (&it == &p_m ? m(p) : f(p)) - // << " from " << (&it == &p_m ? "mask" : "f") << std::endl; - // debug::println("Parent: ", parent); - // debug::println("Zpar: ", zpar); - mln_assertion(!(deja_vu(p) && deja_vu(ext))); if (deja_vu(ext)) // Seen by mask before f. { @@ -283,7 +278,6 @@ namespace mln if (d_ext.has(n) && deja_vu(n)) { P r = internal::find_root(zpar, n); - //std::cout << "Root: " << r << std::endl; if (r != ext) { parent(r) = ext; @@ -315,8 +309,6 @@ namespace mln it.next(); } } - std::cout << ">> MAJ zpar: " << internal::t_prop << " s" << std::endl; - std::cout << "Parent construction: " << tm << " s" << std::endl; tm.restart(); // Canonization @@ -336,7 +328,6 @@ namespace mln mln_assertion((q = parent(p)) == parent(q) || fext(q) != fext(parent(q))); } } - std::cout << "Canonization: " << tm << " s" << std::endl; //mln_postcondition(internal::compute_parent_postconditions(fext, s, parent)); diff --git a/milena/mln/morpho/watershed/topological.hh b/milena/mln/morpho/watershed/topological.hh index 6dea02d..7e44720 100644 --- a/milena/mln/morpho/watershed/topological.hh +++ b/milena/mln/morpho/watershed/topological.hh @@ -694,8 +694,6 @@ namespace mln // p_queue < site > m; std::queue<mln_site(I)> m; - std::cout << "Init" << std::endl; - // Flag C-maxima data::fill(cmax, false); data::fill(enqueued, false); @@ -725,8 +723,6 @@ namespace mln } - std::cout << "end" << std::endl; - // Main loop while (!l.is_empty()) { diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index bf5acf5..a46d2bc 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -165,7 +165,6 @@ namespace mln template <typename G> void change_target(mln::util::edge<G>& e, const G& new_target) { - std::cout << "YES: specialization change_target(edge, graph)" << std::endl; e.change_graph(new_target); } diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index adfebef..e8235f3 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -67,15 +67,6 @@ namespace mln // As a proxy: float subj_(); -// void print() const -// { -// std::cout << running_ << ' ' -// << start_ << ' ' -// << std::clock() << ' ' -// << float(std::clock()) / CLOCKS_PER_SEC << ' ' -// << time_ << std::endl; -// } - double ms() const { return double(std::clock()) * 1000.f / CLOCKS_PER_SEC; -- 1.7.10.4