From 4914cdaa70aaa276e8c987efa0bcde41a03653c8 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Sun, 5 Sep 2004 15:00:43 +0000 Subject: [PATCH] banded triangular and singular tests don't need to repeat vector tests svn path=/trunk/boost/libs/numeric/ublas/; revision=24929 --- Jamfile | 3 - Jamfile.v2 | 3 - test4/Jamfile | 2 +- test4/test4.cpp | 1 - test4/test41.cpp | 214 -------------------------------------------- test4/test43.cpp | 4 + test5/Jamfile | 2 +- test5/test5.cpp | 1 - test5/test51.cpp | 224 ----------------------------------------------- test5/test53.cpp | 4 + test6/Jamfile | 2 +- test6/test6.cpp | 1 - test6/test61.cpp | 215 --------------------------------------------- test6/test63.cpp | 4 + 14 files changed, 15 insertions(+), 665 deletions(-) delete mode 100644 test4/test41.cpp delete mode 100644 test5/test51.cpp delete mode 100644 test6/test61.cpp diff --git a/Jamfile b/Jamfile index 71d94719..d68ad10c 100644 --- a/Jamfile +++ b/Jamfile @@ -76,7 +76,6 @@ test-suite numeric/uBLAS <*>"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test4/test4.cpp - test4/test41.cpp test4/test42.cpp test4/test43.cpp : # args @@ -86,7 +85,6 @@ test-suite numeric/uBLAS <*>"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test5/test5.cpp - test5/test51.cpp test5/test52.cpp test5/test53.cpp : # args @@ -96,7 +94,6 @@ test-suite numeric/uBLAS <*>"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test6/test6.cpp - test6/test61.cpp test6/test62.cpp test6/test63.cpp : # args diff --git a/Jamfile.v2 b/Jamfile.v2 index f715b01c..dee3b9be 100644 --- a/Jamfile.v2 +++ b/Jamfile.v2 @@ -68,7 +68,6 @@ test-suite numeric/uBLAS vacpp:"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test4/test4.cpp - test4/test41.cpp test4/test42.cpp test4/test43.cpp : : : @@ -76,7 +75,6 @@ test-suite numeric/uBLAS vacpp:"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test5/test5.cpp - test5/test51.cpp test5/test52.cpp test5/test53.cpp : : : @@ -84,7 +82,6 @@ test-suite numeric/uBLAS vacpp:"BOOST_UBLAS_NO_ELEMENT_PROXIES" ] [ run test6/test6.cpp - test6/test61.cpp test6/test62.cpp test6/test63.cpp : : : diff --git a/test4/Jamfile b/test4/Jamfile index 68323962..e7be5dcf 100644 --- a/test4/Jamfile +++ b/test4/Jamfile @@ -16,7 +16,7 @@ subproject libs/numeric/ublas/test4 ; -SOURCES = test4 test41 test42 test43 ; +SOURCES = test4 test42 test43 ; exe test4 : $(SOURCES).cpp diff --git a/test4/test4.cpp b/test4/test4.cpp index 82a6531d..c09e186b 100644 --- a/test4/test4.cpp +++ b/test4/test4.cpp @@ -36,7 +36,6 @@ int main () { #ifdef BOOST_MSVC _set_new_handler (std_new_handler); #endif - test_vector (); test_matrix_vector (); test_matrix (); return 0; diff --git a/test4/test41.cpp b/test4/test41.cpp deleted file mode 100644 index b0cc5fe9..00000000 --- a/test4/test41.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// -// Copyright (c) 2000-2002 -// Joerg Walter, Mathias Koch -// -// Permission to use, copy, modify, distribute and sell this software -// and its documentation for any purpose is hereby granted without fee, -// provided that the above copyright notice appear in all copies and -// that both that copyright notice and this permission notice appear -// in supporting documentation. The authors make no representations -// about the suitability of this software for any purpose. -// It is provided "as is" without express or implied warranty. -// -// The authors gratefully acknowledge the support of -// GeNeSys mbH & Co. KG in producing this work. -// - -#include - -#include -#include -#include -#include -#include - -#include "test4.hpp" - -// Test vector expression templates -template -struct test_my_vector { - typedef typename V::value_type value_type; - typedef typename V::size_type size_type; - typedef typename ublas::type_traits::real_type real_type; - - template - void test_with (VP &v1, VP &v2, VP &v3) const { - { - value_type t; - size_type i; - real_type n; - - // Copy and swap - initialize_vector (v1); - initialize_vector (v2); - v1 = v2; - std::cout << "v1 = v2 = " << v1 << std::endl; - v1.assign_temporary (v2); - std::cout << "v1.assign_temporary (v2) = " << v1 << std::endl; - v1.swap (v2); - std::cout << "v1.swap (v2) = " << v1 << " " << v2 << std::endl; - - // Unary vector operations resulting in a vector - initialize_vector (v1); - v2 = - v1; - std::cout << "- v1 = " << v2 << std::endl; - v2 = ublas::conj (v1); - std::cout << "conj (v1) = " << v2 << std::endl; - - // Binary vector operations resulting in a vector - initialize_vector (v1); - initialize_vector (v2); - v3 = v1 + v2; - std::cout << "v1 + v2 = " << v3 << std::endl; - - v3 = v1 - v2; - std::cout << "v1 - v2 = " << v3 << std::endl; - - // Scaling a vector - t = N; - initialize_vector (v1); - v2 = value_type (1.) * v1; - std::cout << "1. * v1 = " << v2 << std::endl; - v2 = t * v1; - std::cout << "N * v1 = " << v2 << std::endl; - initialize_vector (v1); - v2 = v1 * value_type (1.); - std::cout << "v1 * 1. = " << v2 << std::endl; - v2 = v1 * t; - std::cout << "v1 * N = " << v2 << std::endl; - - // Some assignments - initialize_vector (v1); - initialize_vector (v2); - v2 += v1; - std::cout << "v2 += v1 = " << v2 << std::endl; - v2 -= v1; - std::cout << "v2 -= v1 = " << v2 << std::endl; - v2 = v2 + v1; - std::cout << "v2 = v2 + v1 = " << v2 << std::endl; - v2 = v2 - v1; - std::cout << "v2 = v2 - v1 = " << v2 << std::endl; - v1 *= value_type (1.); - std::cout << "v1 *= 1. = " << v1 << std::endl; - v1 *= t; - std::cout << "v1 *= N = " << v1 << std::endl; - - // Unary vector operations resulting in a scalar - initialize_vector (v1); - t = ublas::sum (v1); - std::cout << "sum (v1) = " << t << std::endl; - n = ublas::norm_1 (v1); - std::cout << "norm_1 (v1) = " << n << std::endl; - n = ublas::norm_2 (v1); - std::cout << "norm_2 (v1) = " << n << std::endl; - n = ublas::norm_inf (v1); - std::cout << "norm_inf (v1) = " << n << std::endl; - - i = ublas::index_norm_inf (v1); - std::cout << "index_norm_inf (v1) = " << i << std::endl; - - // Binary vector operations resulting in a scalar - initialize_vector (v1); - initialize_vector (v2); - t = ublas::inner_prod (v1, v2); - std::cout << "inner_prod (v1, v2) = " << t << std::endl; - } - } - void operator () () const { - { - V v1 (N), v2 (N), v3 (N); - test_with (v1, v2, v3); - -#ifdef USE_RANGE - ublas::vector_range vr1 (v1, ublas::range (0, N)), - vr2 (v2, ublas::range (0, N)), - vr3 (v3, ublas::range (0, N)); - test_with (vr1, vr2, vr3); -#endif - -#ifdef USE_SLICE - ublas::vector_slice vs1 (v1, ublas::slice (0, 1, N)), - vs2 (v2, ublas::slice (0, 1, N)), - vs3 (v3, ublas::slice (0, 1, N)); - test_with (vs1, vs2, vs3); -#endif - } - } -}; - -// Test vector -void test_vector () { - std::cout << "test_vector" << std::endl; - -#ifdef USE_BOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_UNBOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_STD_VECTOR -#ifdef USE_FLOAT - std::cout << "float, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif -#endif -#endif -} diff --git a/test4/test43.cpp b/test4/test43.cpp index 3d074602..62576116 100644 --- a/test4/test43.cpp +++ b/test4/test43.cpp @@ -34,6 +34,10 @@ struct test_my_matrix { { value_type t; + // Default Construct + MP default_constuct; + std::cout << "default construct = " << default_constuct << std::endl; + // Copy and swap initialize_matrix (m1); initialize_matrix (m2); diff --git a/test5/Jamfile b/test5/Jamfile index c85b61cd..91b34119 100644 --- a/test5/Jamfile +++ b/test5/Jamfile @@ -16,7 +16,7 @@ subproject libs/numeric/ublas/test5 ; -SOURCES = test5 test51 test52 test53 ; +SOURCES = test5 test52 test53 ; exe test5 : $(SOURCES).cpp diff --git a/test5/test5.cpp b/test5/test5.cpp index 0e460f15..90711b7c 100644 --- a/test5/test5.cpp +++ b/test5/test5.cpp @@ -36,7 +36,6 @@ int main () { #ifdef BOOST_MSVC _set_new_handler (std_new_handler); #endif - test_vector (); test_matrix_vector (); test_matrix (); return 0; diff --git a/test5/test51.cpp b/test5/test51.cpp deleted file mode 100644 index 520e790d..00000000 --- a/test5/test51.cpp +++ /dev/null @@ -1,224 +0,0 @@ -// -// Copyright (c) 2000-2002 -// Joerg Walter, Mathias Koch -// -// Permission to use, copy, modify, distribute and sell this software -// and its documentation for any purpose is hereby granted without fee, -// provided that the above copyright notice appear in all copies and -// that both that copyright notice and this permission notice appear -// in supporting documentation. The authors make no representations -// about the suitability of this software for any purpose. -// It is provided "as is" without express or implied warranty. -// -// The authors gratefully acknowledge the support of -// GeNeSys mbH & Co. KG in producing this work. -// - -#include - -#include -#include -#include -#include -#include - -#include "test5.hpp" - -// Test vector expression templates -template -struct test_my_vector { - typedef typename V::value_type value_type; - typedef typename V::size_type size_type; - typedef typename ublas::type_traits::real_type real_type; - - template - void test_with (VP &v1, VP &v2, VP &v3) const { - { - value_type t; - size_type i; - real_type n; - - // Copy and swap - initialize_vector (v1); - initialize_vector (v2); - v1 = v2; - std::cout << "v1 = v2 = " << v1 << std::endl; - v1.assign_temporary (v2); - std::cout << "v1.assign_temporary (v2) = " << v1 << std::endl; - v1.swap (v2); - std::cout << "v1.swap (v2) = " << v1 << " " << v2 << std::endl; - - // Unary vector operations resulting in a vector - initialize_vector (v1); - v2 = - v1; - std::cout << "- v1 = " << v2 << std::endl; - v2 = ublas::conj (v1); - std::cout << "conj (v1) = " << v2 << std::endl; - - // Binary vector operations resulting in a vector - initialize_vector (v1); - initialize_vector (v2); - v3 = v1 + v2; - std::cout << "v1 + v2 = " << v3 << std::endl; - - v3 = v1 - v2; - std::cout << "v1 - v2 = " << v3 << std::endl; - - // Scaling a vector - t = N; - initialize_vector (v1); - v2 = value_type (1.) * v1; - std::cout << "1. * v1 = " << v2 << std::endl; - v2 = t * v1; - std::cout << "N * v1 = " << v2 << std::endl; - initialize_vector (v1); - v2 = v1 * value_type (1.); - std::cout << "v1 * 1. = " << v2 << std::endl; - v2 = v1 * t; - std::cout << "v1 * N = " << v2 << std::endl; - - // Some assignments - initialize_vector (v1); - initialize_vector (v2); - v2 += v1; - std::cout << "v2 += v1 = " << v2 << std::endl; - v2 -= v1; - std::cout << "v2 -= v1 = " << v2 << std::endl; - v2 = v2 + v1; - std::cout << "v2 = v2 + v1 = " << v2 << std::endl; - v2 = v2 - v1; - std::cout << "v2 = v2 - v1 = " << v2 << std::endl; - v1 *= value_type (1.); - std::cout << "v1 *= 1. = " << v1 << std::endl; - v1 *= t; - std::cout << "v1 *= N = " << v1 << std::endl; - - // Unary vector operations resulting in a scalar - initialize_vector (v1); - t = ublas::sum (v1); - std::cout << "sum (v1) = " << t << std::endl; - n = ublas::norm_1 (v1); - std::cout << "norm_1 (v1) = " << n << std::endl; - n = ublas::norm_2 (v1); - std::cout << "norm_2 (v1) = " << n << std::endl; - n = ublas::norm_inf (v1); - std::cout << "norm_inf (v1) = " << n << std::endl; - - i = ublas::index_norm_inf (v1); - std::cout << "index_norm_inf (v1) = " << i << std::endl; - - // Binary vector operations resulting in a scalar - initialize_vector (v1); - initialize_vector (v2); - t = ublas::inner_prod (v1, v2); - std::cout << "inner_prod (v1, v2) = " << t << std::endl; - - // Scalar and binary vector expression resulting in a vector - initialize_vector (v1); - initialize_vector (v2); - v1 = v1 * ublas::inner_prod (v1, v2); - std::cout << "v1 * inner_prod (v1, v2) = " << v1 << std::endl; - initialize_vector (v1); - initialize_vector (v2); - v1 = ublas::inner_prod (v1, v2) * v1; - std::cout << "inner_prod (v1, v2) * v1 = " << v1 << std::endl; - } - } - void operator () () const { - { - V v1 (N), v2 (N), v3 (N); - test_with (v1, v2, v3); - -#ifdef USE_RANGE - ublas::vector_range vr1 (v1, ublas::range (0, N)), - vr2 (v2, ublas::range (0, N)), - vr3 (v3, ublas::range (0, N)); - test_with (vr1, vr2, vr3); -#endif - -#ifdef USE_SLICE - ublas::vector_slice vs1 (v1, ublas::slice (0, 1, N)), - vs2 (v2, ublas::slice (0, 1, N)), - vs3 (v3, ublas::slice (0, 1, N)); - test_with (vs1, vs2, vs3); -#endif - } - } -}; - -// Test vector -void test_vector () { - std::cout << "test_vector" << std::endl; - -#ifdef USE_BOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_UNBOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_STD_VECTOR -#ifdef USE_FLOAT - std::cout << "float, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif -#endif -#endif -} diff --git a/test5/test53.cpp b/test5/test53.cpp index c51a61ca..82a97d02 100644 --- a/test5/test53.cpp +++ b/test5/test53.cpp @@ -34,6 +34,10 @@ struct test_my_matrix { { value_type t; + // Default Construct + MP default_constuct; + std::cout << "default construct = " << default_constuct << std::endl; + // Copy and swap initialize_matrix (m1, ublas::lower_tag ()); initialize_matrix (m2, ublas::lower_tag ()); diff --git a/test6/Jamfile b/test6/Jamfile index 16f3748a..7da15ade 100644 --- a/test6/Jamfile +++ b/test6/Jamfile @@ -16,7 +16,7 @@ subproject libs/numeric/ublas/test6 ; -SOURCES = test6 test61 test62 test63 ; +SOURCES = test6 test62 test63 ; exe test6 : $(SOURCES).cpp diff --git a/test6/test6.cpp b/test6/test6.cpp index ef8b3a31..d1b00c36 100644 --- a/test6/test6.cpp +++ b/test6/test6.cpp @@ -37,7 +37,6 @@ int main () { #ifdef BOOST_MSVC _set_new_handler (std_new_handler); #endif - test_vector (); test_matrix_vector (); test_matrix (); return 0; diff --git a/test6/test61.cpp b/test6/test61.cpp deleted file mode 100644 index f22deae1..00000000 --- a/test6/test61.cpp +++ /dev/null @@ -1,215 +0,0 @@ -// -// Copyright (c) 2000-2002 -// Joerg Walter, Mathias Koch -// -// Permission to use, copy, modify, distribute and sell this software -// and its documentation for any purpose is hereby granted without fee, -// provided that the above copyright notice appear in all copies and -// that both that copyright notice and this permission notice appear -// in supporting documentation. The authors make no representations -// about the suitability of this software for any purpose. -// It is provided "as is" without express or implied warranty. -// -// The authors gratefully acknowledge the support of -// GeNeSys mbH & Co. KG in producing this work. -// - -#include - -#include -#include -#include -#include -#include -#include - -#include "test6.hpp" - -// Test vector expression templates -template -struct test_my_vector { - typedef typename V::value_type value_type; - typedef typename V::size_type size_type; - typedef typename ublas::type_traits::real_type real_type; - - template - void test_with (VP &v1, VP &v2, VP &v3) const { - { - value_type t; - size_type i; - real_type n; - - // Copy and swap - initialize_vector (v1); - initialize_vector (v2); - v1 = v2; - std::cout << "v1 = v2 = " << v1 << std::endl; - v1.assign_temporary (v2); - std::cout << "v1.assign_temporary (v2) = " << v1 << std::endl; - v1.swap (v2); - std::cout << "v1.swap (v2) = " << v1 << " " << v2 << std::endl; - - // Unary vector operations resulting in a vector - initialize_vector (v1); - v2 = - v1; - std::cout << "- v1 = " << v2 << std::endl; - v2 = ublas::conj (v1); - std::cout << "conj (v1) = " << v2 << std::endl; - - // Binary vector operations resulting in a vector - initialize_vector (v1); - initialize_vector (v2); - v3 = v1 + v2; - std::cout << "v1 + v2 = " << v3 << std::endl; - - v3 = v1 - v2; - std::cout << "v1 - v2 = " << v3 << std::endl; - - // Scaling a vector - t = N; - initialize_vector (v1); - v2 = value_type (1.) * v1; - std::cout << "1. * v1 = " << v2 << std::endl; - v2 = t * v1; - std::cout << "N * v1 = " << v2 << std::endl; - initialize_vector (v1); - v2 = v1 * value_type (1.); - std::cout << "v1 * 1. = " << v2 << std::endl; - v2 = v1 * t; - std::cout << "v1 * N = " << v2 << std::endl; - - // Some assignments - initialize_vector (v1); - initialize_vector (v2); - v2 += v1; - std::cout << "v2 += v1 = " << v2 << std::endl; - v2 -= v1; - std::cout << "v2 -= v1 = " << v2 << std::endl; - v2 = v2 + v1; - std::cout << "v2 = v2 + v1 = " << v2 << std::endl; - v2 = v2 - v1; - std::cout << "v2 = v2 - v1 = " << v2 << std::endl; - v1 *= value_type (1.); - std::cout << "v1 *= 1. = " << v1 << std::endl; - v1 *= t; - std::cout << "v1 *= N = " << v1 << std::endl; - - // Unary vector operations resulting in a scalar - initialize_vector (v1); - t = ublas::sum (v1); - std::cout << "sum (v1) = " << t << std::endl; - n = ublas::norm_1 (v1); - std::cout << "norm_1 (v1) = " << n << std::endl; - n = ublas::norm_2 (v1); - std::cout << "norm_2 (v1) = " << n << std::endl; - n = ublas::norm_inf (v1); - std::cout << "norm_inf (v1) = " << n << std::endl; - - i = ublas::index_norm_inf (v1); - std::cout << "index_norm_inf (v1) = " << i << std::endl; - - // Binary vector operations resulting in a scalar - initialize_vector (v1); - initialize_vector (v2); - t = ublas::inner_prod (v1, v2); - std::cout << "inner_prod (v1, v2) = " << t << std::endl; - } - } - void operator () () const { - { - V v1 (N), v2 (N), v3 (N); - test_with (v1, v2, v3); - -#ifdef USE_RANGE - ublas::vector_range vr1 (v1, ublas::range (0, N)), - vr2 (v2, ublas::range (0, N)), - vr3 (v3, ublas::range (0, N)); - test_with (vr1, vr2, vr3); -#endif - -#ifdef USE_SLICE - ublas::vector_slice vs1 (v1, ublas::slice (0, 1, N)), - vs2 (v2, ublas::slice (0, 1, N)), - vs3 (v3, ublas::slice (0, 1, N)); - test_with (vs1, vs2, vs3); -#endif - } - } -}; - -// Test vector -void test_vector () { - std::cout << "test_vector" << std::endl; - -#ifdef USE_BOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, bounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, bounded_array" << std::endl; - test_my_vector, ublas::bounded_array, 3> >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_UNBOUNDED_ARRAY -#ifdef USE_FLOAT - std::cout << "float, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, unbounded_array" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, unbounded_array" << std::endl; - test_my_vector, ublas::unbounded_array > >, 3 > () (); -#endif -#endif -#endif - -#ifdef USE_STD_VECTOR -#ifdef USE_FLOAT - std::cout << "float, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "double, std::vector" << std::endl; - test_my_vector >, 3 > () (); -#endif - -#ifdef USE_STD_COMPLEX -#ifdef USE_FLOAT - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif - -#ifdef USE_DOUBLE - std::cout << "std::complex, std::vector" << std::endl; - test_my_vector, std::vector > >, 3 > () (); -#endif -#endif -#endif -} diff --git a/test6/test63.cpp b/test6/test63.cpp index 95267e17..46e91164 100644 --- a/test6/test63.cpp +++ b/test6/test63.cpp @@ -35,6 +35,10 @@ struct test_my_matrix { { value_type t; + // Default Construct + MP default_constuct; + std::cout << "default construct = " << default_constuct << std::endl; + // Copy and swap initialize_matrix (m1, ublas::lower_tag ()); initialize_matrix (m2, ublas::lower_tag ());