Commit 7ef04570 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Remove useless traces.

	* mln/geom/bbox.hh,
	* mln/geom/max_col.hh,
	* mln/geom/max_row.hh,
	* mln/geom/max_sli.hh,
	* mln/geom/min_col.hh,
	* mln/geom/min_row.hh,
	* mln/geom/min_sli.hh,
	* mln/geom/ncols.hh,
	* mln/geom/nrows.hh,
	* mln/geom/nslis.hh: Remove useless traces.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4723 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 514b0904
2009-11-18 Guillaume Lazzara <z@lrde.epita.fr>
Remove useless traces.
* mln/geom/bbox.hh,
* mln/geom/max_col.hh,
* mln/geom/max_row.hh,
* mln/geom/max_sli.hh,
* mln/geom/min_col.hh,
* mln/geom/min_row.hh,
* mln/geom/min_sli.hh,
* mln/geom/ncols.hh,
* mln/geom/nrows.hh,
* mln/geom/nslis.hh: Remove useless traces.
2009-11-18 Guillaume Lazzara <z@lrde.epita.fr>
 
Improve influence zone geodesic.
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -34,7 +35,7 @@
* \todo Re-activate precondition so introduce
* "set::nsites(Site_Set)"...
*
* \todo Add a static check "domain is ok for bbox (like grid)".
* \todo Add a static check "domain is ok for bbox (like grid)".
*
* \todo Add the weighted_window case.
*/
......@@ -120,34 +121,27 @@ namespace mln
inline
box<mln_site(S)> bbox(const Site_Set<S>& pset)
{
trace::entering("geom::bbox");
// mln_precondition(set::is_empty(pset) != 0);
box<mln_site(S)> b = impl::bbox_(mln_trait_site_set_bbox(S)(),
exact(pset));
trace::exiting("geom::bbox");
return b;
}
template <typename I>
box<mln_site(I)> bbox(const Image<I>& ima_)
{
trace::entering("geom::bbox");
const I& ima = exact(ima_);
mln_precondition(ima.is_valid());
box<mln_site(I)> b = geom::bbox(ima.domain());
trace::exiting("geom::bbox");
return b;
}
template <typename W>
box<mln_psite(W)> bbox(const Window<W>& win)
{
trace::entering("geom::bbox");
typedef mln_psite(W) P;
accu::shape::bbox<P> b;
P O = literal::origin;
......@@ -155,18 +149,14 @@ namespace mln
for_all(q)
b.take(q);
trace::exiting("geom::bbox");
return b;
}
template <typename W>
box<mln_psite(W)> bbox(const Weighted_Window<W>& win)
{
trace::entering("geom::bbox");
box<mln_psite(W)> b = bbox(exact(win).win());
trace::exiting("geom::bbox");
return b;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -54,12 +55,9 @@ namespace mln
inline
mln_deduce(I, site, coord) max_col(const Image<I>& ima)
{
trace::entering("mln::geom::max_col");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) maxcol = geom::bbox(ima).pmax().col();
trace::exiting("mln::geom::max_col");
return maxcol;
}
......@@ -68,12 +66,9 @@ namespace mln
inline
mln_deduce(B, point, coord) max_col(const Box<B>& b)
{
trace::entering("mln::geom::max_col");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
mln_deduce(B, point, coord) maxcol = exact(b).pmax().col();
trace::exiting("mln::geom::max_col");
return maxcol;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -55,12 +56,9 @@ namespace mln
inline
mln_deduce(I, site, coord) max_row(const Image<I>& ima)
{
trace::entering("mln::geom::max_row");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) maxrow = geom::bbox(ima).pmax().row();
trace::exiting("mln::geom::max_row");
return maxrow;
}
......@@ -69,12 +67,9 @@ namespace mln
inline
mln_deduce(B, point, coord) max_row(const Box<B>& b)
{
trace::entering("mln::geom::max_row");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
mln_deduce(B, point, coord) maxrow = exact(b).pmax().row();
trace::exiting("mln::geom::max_row");
return maxrow;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -51,12 +52,9 @@ namespace mln
inline
mln_deduce(I, site, coord) max_sli(const Image<I>& ima)
{
trace::entering("mln::geom::max_sli");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) maxsli = geom::bbox(ima).pmax().sli();
trace::exiting("mln::geom::max_sli");
return maxsli;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -55,12 +56,9 @@ namespace mln
inline
mln_deduce(I, site, coord) min_col(const Image<I>& ima)
{
trace::entering("mln::geom::min_col");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) mincol = geom::bbox(ima).pmin().col();
trace::exiting("mln::geom::min_col");
return mincol;
}
......@@ -69,12 +67,9 @@ namespace mln
inline
mln_deduce(B, point, coord) min_col(const Box<B>& b)
{
trace::entering("mln::geom::min_col");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
mln_deduce(B, point, coord) mincol = exact(b).pmin().col();
trace::exiting("mln::geom::min_col");
return mincol;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -58,12 +59,9 @@ namespace mln
inline
mln_deduce(I, site, coord) min_row(const Image<I>& ima)
{
trace::entering("mln::geom::min_row");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) minrow = geom::bbox(ima).pmin().row();
trace::exiting("mln::geom::min_row");
return minrow;
}
......@@ -72,12 +70,9 @@ namespace mln
inline
mln_deduce(B, point, coord) min_row(const Box<B>& b)
{
trace::entering("mln::geom::min_row");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
mln_deduce(B, point, coord) minrow = exact(b).pmin().row();
trace::exiting("mln::geom::min_row");
return minrow;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -51,12 +52,9 @@ namespace mln
inline
mln_deduce(I, site, coord) min_sli(const Image<I>& ima)
{
trace::entering("mln::geom::min_sli");
mln_precondition(exact(ima).is_valid());
mln_deduce(I, site, coord) minsli = geom::bbox(ima).pmin().sli();
trace::exiting("mln::geom::min_sli");
return minsli;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -55,12 +56,9 @@ namespace mln
inline
unsigned ncols(const Image<I>& ima)
{
trace::entering("mln::geom::ncols");
mln_precondition(exact(ima).is_valid());
unsigned ncols = geom::max_col(ima) - geom::min_col(ima) + 1;
trace::exiting("mln::geom::ncols");
return ncols;
}
......@@ -68,12 +66,9 @@ namespace mln
template <typename B>
unsigned ncols(const Box<B>& b)
{
trace::entering("mln::geom::ncols");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
unsigned ncols = geom::max_col(b) - geom::min_col(b) + 1;
trace::exiting("mln::geom::ncols");
return ncols;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -55,24 +56,18 @@ namespace mln
inline
unsigned nrows(const Image<I>& ima)
{
trace::entering("mln::geom::nrows");
mln_precondition(exact(ima).is_valid());
unsigned nrows = geom::max_row(ima) - geom::min_row(ima) + 1;
trace::exiting("mln::geom::nrows");
return nrows;
}
template <typename B>
unsigned nrows(const Box<B>& b)
{
trace::entering("mln::geom::nrows");
metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check();
unsigned nrows = geom::max_row(b) - geom::min_row(b) + 1;
trace::exiting("mln::geom::nrows");
return nrows;
}
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -51,12 +52,9 @@ namespace mln
inline
unsigned nslis(const Image<I>& ima)
{
trace::entering("mln::geom::nslis");
mln_precondition(exact(ima).is_valid());
unsigned nslis = geom::max_sli(ima) - geom::min_sli(ima) + 1;
trace::exiting("mln::geom::nslis");
return nslis;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment