Commit 95ac14a3 authored by Roland Levillain's avatar Roland Levillain
Browse files

Fix a couple of Milena tests.

	* tests/accu/compute.cc: Correction the checked assertion.
	* tests/value/scalar.cc: Remove this (non-relevant) test.
parent ce1802a5
2013-08-23 Roland Levillain <roland@lrde.epita.fr>
Fix a couple of Milena tests.
* tests/accu/compute.cc: Correction the checked assertion.
* tests/value/scalar.cc: Remove this (non-relevant) test.
2013-08-23 Roland Levillain <roland@lrde.epita.fr>
 
* mln/data/transform: Remove (empty) file.
// 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.
//
......@@ -38,5 +39,5 @@ int main()
unsigned n = 3;
image2d<int_u8> ima(n, n);
unsigned c = accu::compute(accu::meta::math::count(), ima);
mln_assertion(c = n * n);
mln_assertion(c == n * n);
}
......@@ -33,7 +33,6 @@ check_PROGRAMS = \
label \
proxy \
rgb8 \
scalar \
set \
sign
# float01
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
//
// This file is part of Olena.
//
// Olena is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free
// Software Foundation, version 2 of the License.
//
// Olena is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
//
// As a special exception, you may use this file as part of a free
// software project without restriction. Specifically, if other files
// instantiate templates or use macros or inline functions from this
// file, or you compile this file and link it with other files to produce
// an executable, this file does not by itself cause the resulting
// executable to be covered by the GNU General Public License. This
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
#include <iostream>
#include <mln/value/scalar.hh>
#include <mln/value/int_u8.hh>
template <typename T>
void foo(const T& t)
{
std::cout << mln::value::scalar(t) << std::endl;
}
namespace mln
{
namespace trait
{
// FIXME: Dead code?
// template <typename O1, typename O2>
// struct set_binary_< op::less, Object,O1, Object,O2 > { typedef bool ret; };
// template < typename Vl, typename Vr >
// struct set_binary_< op::less, mln::value::Scalar, Vl, mln::value::Scalar, Vr >
// {
// typedef double ret;
// };
// template <typename B, typename O>
// struct set_binary_< op::less,
// mln::value::Integer, B,
// mln::value::Scalar, O >
// {
// typedef bool ret;
// };
}
}
int main()
{
using namespace mln;
// FIXME: Dead code?
// int i = 51;
// foo(i);
// foo( value::scalar(i) );
{
bool b;
value::int_u8 i, j;
b = 1 > value::scalar(j);
b = value::scalar(j) < value::scalar(j);
// FIXME: Dead code?
// mln_trait_op_less_(value::scalar_< value::int_u8 >, value::scalar_< value::int_u8 >) tmp;
// void* v = tmp;
// mln_trait_op_less_(int, value::scalar_< value::int_u8 >) tmp;
// void* v = tmp;
}
}
Markdown is supported
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