boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-13 00:42:14 +00:00
Code Issues Projects Releases Wiki Activity

banded triangular and singular tests don't need to repeat

Browse Source 
vector tests

svn path=/trunk/boost/libs/numeric/ublas/; revision=24929
This commit is contained in:
Michael Stevens
2004-09-05 15:00:43 +00:00
parent d8c9e2b039
commit 4914cdaa70
14 changed files with 15 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Jamfile
View File

@@ -76,7 +76,6 @@ test-suite numeric/uBLAS
<vacpp><*><define>"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
<vacpp><*><define>"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
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
test6/test61.cpp
test6/test62.cpp
test6/test63.cpp
: # args

3
Jamfile.v2
View File

@@ -68,7 +68,6 @@ test-suite numeric/uBLAS
<toolset>vacpp:<define>"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
<toolset>vacpp:<define>"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
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
test6/test61.cpp
test6/test62.cpp
test6/test63.cpp
: : :

2
test4/Jamfile
View File

@@ -16,7 +16,7 @@
subproject libs/numeric/ublas/test4 ;
SOURCES = test4 test41 test42 test43 ;
SOURCES = test4 test42 test43 ;
exe test4
: $(SOURCES).cpp

1
test4/test4.cpp
View File

@@ -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;

214
test4/test41.cpp
View File

@@ -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 <iostream>
#include <boost/numeric/ublas/config.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/banded.hpp>
#include <boost/numeric/ublas/io.hpp>
#include "test4.hpp"
// Test vector expression templates
template<class V, int N>
struct test_my_vector {
typedef typename V::value_type value_type;
typedef typename V::size_type size_type;
typedef typename ublas::type_traits<value_type>::real_type real_type;
template<class VP>
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<V> 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<V> 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<ublas::vector<float, ublas::bounded_array<float, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, bounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::bounded_array<double, 3> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::bounded_array<std::complex<float>, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::bounded_array<std::complex<double>, 3> >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_UNBOUNDED_ARRAY
#ifdef USE_FLOAT
std::cout << "float, unbounded_array" << std::endl;
test_my_vector<ublas::vector<float, ublas::unbounded_array<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, unbounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::unbounded_array<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::unbounded_array<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::unbounded_array<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_STD_VECTOR
#ifdef USE_FLOAT
std::cout << "float, std::vector" << std::endl;
test_my_vector<ublas::vector<float, std::vector<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, std::vector" << std::endl;
test_my_vector<ublas::vector<double, std::vector<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, std::vector<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, std::vector<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
}

4
test4/test43.cpp
View File

@@ -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);

2
test5/Jamfile
View File

@@ -16,7 +16,7 @@
subproject libs/numeric/ublas/test5 ;
SOURCES = test5 test51 test52 test53 ;
SOURCES = test5 test52 test53 ;
exe test5
: $(SOURCES).cpp

1
test5/test5.cpp
View File

@@ -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;

224
test5/test51.cpp
View File

@@ -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 <iostream>
#include <boost/numeric/ublas/config.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/triangular.hpp>
#include <boost/numeric/ublas/io.hpp>
#include "test5.hpp"
// Test vector expression templates
template<class V, int N>
struct test_my_vector {
typedef typename V::value_type value_type;
typedef typename V::size_type size_type;
typedef typename ublas::type_traits<value_type>::real_type real_type;
template<class VP>
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<V> 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<V> 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<ublas::vector<float, ublas::bounded_array<float, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, bounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::bounded_array<double, 3> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::bounded_array<std::complex<float>, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::bounded_array<std::complex<double>, 3> >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_UNBOUNDED_ARRAY
#ifdef USE_FLOAT
std::cout << "float, unbounded_array" << std::endl;
test_my_vector<ublas::vector<float, ublas::unbounded_array<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, unbounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::unbounded_array<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::unbounded_array<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::unbounded_array<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_STD_VECTOR
#ifdef USE_FLOAT
std::cout << "float, std::vector" << std::endl;
test_my_vector<ublas::vector<float, std::vector<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, std::vector" << std::endl;
test_my_vector<ublas::vector<double, std::vector<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, std::vector<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, std::vector<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
}

4
test5/test53.cpp
View File

@@ -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 ());

2
test6/Jamfile
View File

@@ -16,7 +16,7 @@
subproject libs/numeric/ublas/test6 ;
SOURCES = test6 test61 test62 test63 ;
SOURCES = test6 test62 test63 ;
exe test6
: $(SOURCES).cpp

1
test6/test6.cpp
View File

@@ -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;

215
test6/test61.cpp
View File

@@ -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 <iostream>
#include <boost/numeric/ublas/config.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/triangular.hpp>
#include <boost/numeric/ublas/symmetric.hpp>
#include <boost/numeric/ublas/io.hpp>
#include "test6.hpp"
// Test vector expression templates
template<class V, int N>
struct test_my_vector {
typedef typename V::value_type value_type;
typedef typename V::size_type size_type;
typedef typename ublas::type_traits<value_type>::real_type real_type;
template<class VP>
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<V> 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<V> 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<ublas::vector<float, ublas::bounded_array<float, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, bounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::bounded_array<double, 3> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::bounded_array<std::complex<float>, 3> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, bounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::bounded_array<std::complex<double>, 3> >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_UNBOUNDED_ARRAY
#ifdef USE_FLOAT
std::cout << "float, unbounded_array" << std::endl;
test_my_vector<ublas::vector<float, ublas::unbounded_array<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, unbounded_array" << std::endl;
test_my_vector<ublas::vector<double, ublas::unbounded_array<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, ublas::unbounded_array<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, unbounded_array" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, ublas::unbounded_array<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
#ifdef USE_STD_VECTOR
#ifdef USE_FLOAT
std::cout << "float, std::vector" << std::endl;
test_my_vector<ublas::vector<float, std::vector<float> >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "double, std::vector" << std::endl;
test_my_vector<ublas::vector<double, std::vector<double> >, 3 > () ();
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
std::cout << "std::complex<float>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<float>, std::vector<std::complex<float> > >, 3 > () ();
#endif
#ifdef USE_DOUBLE
std::cout << "std::complex<double>, std::vector" << std::endl;
test_my_vector<ublas::vector<std::complex<double>, std::vector<std::complex<double> > >, 3 > () ();
#endif
#endif
#endif
}

4
test6/test63.cpp
View File

@@ -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 ());