Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80563 - trunk/libs/numeric/ublas/test
From: guwi17_at_[hidden]
Date: 2012-09-17 15:56:34


Author: guwi17
Date: 2012-09-17 15:56:33 EDT (Mon, 17 Sep 2012)
New Revision: 80563
URL: http://svn.boost.org/trac/boost/changeset/80563

Log:

* libs/numeric/ublas/test/test_ticket7296.cpp: see #7296 - add missing test

Added:
   trunk/libs/numeric/ublas/test/test_ticket7296.cpp (contents, props changed)

Added: trunk/libs/numeric/ublas/test/test_ticket7296.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/numeric/ublas/test/test_ticket7296.cpp 2012-09-17 15:56:33 EDT (Mon, 17 Sep 2012)
@@ -0,0 +1,292 @@
+/**
+ * \file libs/numeric/ublas/test/test_utils.hpp
+ *
+ * \brief Test suite for utils.hpp.
+ *
+ * Copyright (c) 2012, Marco Guazzone
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * \author Marco Guazzone (marco.guazzone_at_[hidden])
+ */
+
+#include <boost/numeric/ublas/io.hpp>
+#include <boost/numeric/ublas/matrix.hpp>
+#include <boost/numeric/ublas/vector.hpp>
+#include <complex>
+#include <cstddef>
+#include <libs/numeric/ublas/test/utils.hpp>
+
+
+namespace ublas = boost::numeric::ublas;
+
+
+static const double tol(1e-6);
+static const double mul(tol*10);
+
+
+BOOST_UBLAS_TEST_DEF( check )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check'" );
+
+ BOOST_UBLAS_TEST_CHECK( true );
+}
+
+BOOST_UBLAS_TEST_DEF( check_eq )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_eq'" );
+
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_EQ( short(1), short(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( int(1), int(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( long(1), long(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( unsigned(1), unsigned(1) );
+
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_EQ( short(1), int(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( short(1), int(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( int(1), long(1) );
+ BOOST_UBLAS_TEST_CHECK_EQ( long(1), int(1) );
+
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test aliases." );
+ BOOST_UBLAS_TEST_CHECK_EQUAL( int(1), int(1) );
+}
+
+BOOST_UBLAS_TEST_DEF( check_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_close'" );
+
+ const double c1(1*mul);
+ const double c2(2*mul);
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( float(c1), float(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( double(c1), double(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( ::std::complex<float>(c1,c2), ::std::complex<float>(c1,c2), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( ::std::complex<double>(c1,c2), ::std::complex<double>(c1,c2), tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( float(c1), double(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( double(c1), float(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( ::std::complex<float>(c1,c2), ::std::complex<double>(c1,c2), tol );
+ BOOST_UBLAS_TEST_CHECK_CLOSE( ::std::complex<double>(c1,c2), ::std::complex<float>(c1,c2), tol );
+
+ // Check alias
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test aliases." );
+ BOOST_UBLAS_TEST_CHECK_PRECISION( float(c1), float(c1), tol );
+}
+
+BOOST_UBLAS_TEST_DEF( check_rel_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_rel_close'" );
+
+ const double c1(1*mul);
+ const double c2(2*mul);
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( float(c1), float(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( double(c1), double(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( ::std::complex<float>(c1,c2), ::std::complex<float>(c1,c2), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( ::std::complex<double>(c1,c2), ::std::complex<double>(c1,c2), tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( float(c1), double(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( double(c1), float(c1), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( ::std::complex<float>(c1,c2), ::std::complex<double>(c1,c2), tol );
+ BOOST_UBLAS_TEST_CHECK_REL_CLOSE( ::std::complex<double>(c1,c2), ::std::complex<float>(c1,c2), tol );
+
+ // Check alias
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test aliases." );
+ BOOST_UBLAS_TEST_CHECK_REL_PRECISION( float(c1), float(c1), tol );
+}
+
+BOOST_UBLAS_TEST_DEF( check_vector_eq )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_vector_eq'" );
+
+ const ::std::size_t n(5);
+
+ ublas::vector<short> sv = ublas::scalar_vector<short>(n, 1);
+ ublas::vector<int> iv = ublas::scalar_vector<int>(n, 1);
+ ublas::vector<long> lv = ublas::scalar_vector<long>(n, 1L);
+ ublas::vector<unsigned> uv = ublas::scalar_vector<unsigned>(n, 1u);
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( sv, sv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( iv, iv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( lv, lv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( uv, uv, n );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( sv, iv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( iv, sv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( iv, lv, n );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_EQ( lv, iv, n );
+}
+
+BOOST_UBLAS_TEST_DEF( check_vector_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_vector_close'" );
+
+ const ::std::size_t n(5);
+
+ ublas::vector<float> fv = ublas::scalar_vector<float>(n, 1);
+ ublas::vector<float> dv = ublas::scalar_vector<float>(n, 1);
+ ublas::vector< ::std::complex<float> > cfv = ublas::scalar_vector< ::std::complex<float> >(n, ::std::complex<float>(1,2));
+ ublas::vector< ::std::complex<double> > cdv = ublas::scalar_vector< ::std::complex<double> >(n, ::std::complex<double>(1,2));
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( fv, fv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( dv, dv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( cfv, cfv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( cdv, cdv, n, tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( fv, dv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( dv, fv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( cfv, cdv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_CLOSE( cdv, cfv, n, tol );
+}
+
+BOOST_UBLAS_TEST_DEF( check_vector_rel_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_vector_rel_close'" );
+
+ const ::std::size_t n(5);
+ const double c1(1*mul);
+ const double c2(2*mul);
+
+ ublas::vector<float> fv = ublas::scalar_vector<float>(n, c1);
+ ublas::vector<double> dv = ublas::scalar_vector<double>(n, c1);
+ ublas::vector< ::std::complex<float> > cfv = ublas::scalar_vector< ::std::complex<float> >(n, ::std::complex<float>(c1,c2));
+ ublas::vector< ::std::complex<double> > cdv = ublas::scalar_vector< ::std::complex<double> >(n, ::std::complex<double>(c1,c2));
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( fv, fv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( dv, dv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( cfv, cfv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( cdv, cdv, n, tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( fv, dv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( dv, fv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( cfv, cdv, n, tol );
+ BOOST_UBLAS_TEST_CHECK_VECTOR_REL_CLOSE( cdv, cfv, n, tol );
+}
+
+BOOST_UBLAS_TEST_DEF( check_matrix_eq )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_matrix_eq'" );
+
+ const ::std::size_t nr(3);
+ const ::std::size_t nc(4);
+
+ ublas::matrix<short> sv = ublas::scalar_matrix<short>(nr, nc, 1);
+ ublas::matrix<int> iv = ublas::scalar_matrix<int>(nr, nc, 1);
+ ublas::matrix<long> lv = ublas::scalar_matrix<long>(nr, nc, 1L);
+ ublas::matrix<unsigned> uv = ublas::scalar_matrix<unsigned>(nr, nc, 1u);
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( sv, sv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( iv, iv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( lv, lv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( uv, uv, nr, nc );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( sv, iv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( iv, sv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( iv, lv, nr, nc );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_EQ( lv, iv, nr, nc );
+}
+
+BOOST_UBLAS_TEST_DEF( check_matrix_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_matrix_close'" );
+
+ const ::std::size_t nr(3);
+ const ::std::size_t nc(4);
+ const double c1(1*mul);
+ const double c2(2*mul);
+
+ ublas::matrix<float> fA = ublas::scalar_matrix<float>(nr, nc, c1);
+ ublas::matrix<double> dA = ublas::scalar_matrix<double>(nr, nc, c1);
+ ublas::matrix< ::std::complex<float> > cfA = ublas::scalar_matrix< ::std::complex<float> >(nr, nc, ::std::complex<float>(c1,c2));
+ ublas::matrix< ::std::complex<double> > cdA = ublas::scalar_matrix< ::std::complex<double> >(nr, nc, ::std::complex<double>(c1,c2));
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( fA, fA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( dA, dA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( cfA, cfA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( cdA, cdA, nr, nc, tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( fA, dA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( dA, fA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( cfA, cdA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_CLOSE( cdA, cfA, nr, nc, tol );
+}
+
+
+BOOST_UBLAS_TEST_DEF( check_matrix_rel_close )
+{
+ BOOST_UBLAS_TEST_TRACE( "Test case: 'check_matrix_rel_close'" );
+
+ const ::std::size_t nr(3);
+ const ::std::size_t nc(4);
+ const double c1(1*mul);
+ const double c2(2*mul);
+
+ ublas::matrix<float> fA = ublas::scalar_matrix<float>(nr, nc, c1);
+ ublas::matrix<double> dA = ublas::scalar_matrix<double>(nr, nc, c1);
+ ublas::matrix< ::std::complex<float> > cfA = ublas::scalar_matrix< ::std::complex<float> >(nr, nc, ::std::complex<float>(c1,c2));
+ ublas::matrix< ::std::complex<double> > cdA = ublas::scalar_matrix< ::std::complex<double> >(nr, nc, ::std::complex<double>(c1,c2));
+
+ // Check T vs. T
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against same types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( fA, fA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( dA, dA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( cfA, cfA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( cdA, cdA, nr, nc, tol );
+
+ // Check T1 vs. T2
+ BOOST_UBLAS_DEBUG_TRACE( "-- Test against different types." );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( fA, dA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( dA, fA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( cfA, cdA, nr, nc, tol );
+ BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE( cdA, cfA, nr, nc, tol );
+}
+
+
+int main()
+{
+ BOOST_UBLAS_TEST_SUITE( "Test 'utils.hpp' functionalities" );
+
+ BOOST_UBLAS_TEST_BEGIN();
+ BOOST_UBLAS_TEST_DO( check );
+ BOOST_UBLAS_TEST_DO( check_eq );
+ BOOST_UBLAS_TEST_DO( check_close );
+ BOOST_UBLAS_TEST_DO( check_rel_close );
+ BOOST_UBLAS_TEST_DO( check_vector_eq );
+ BOOST_UBLAS_TEST_DO( check_vector_close );
+ BOOST_UBLAS_TEST_DO( check_vector_rel_close );
+ BOOST_UBLAS_TEST_DO( check_matrix_eq );
+ BOOST_UBLAS_TEST_DO( check_matrix_close );
+ BOOST_UBLAS_TEST_DO( check_matrix_rel_close );
+ BOOST_UBLAS_TEST_END();
+}


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk