baa4a437c0
- This is almost identical to the fix used on #6511: Bugs: Division by scalar should use enable_if<> (closed: fixed) - Scalar multiply was allowed, but divide was not. - Updated test13 to include test of this capability - Scaling a matrix now includes two more lines for division 1. * m1 = [3,3]((1,2,3),(4,5,6),(7,8,9)) N * m1 = [3,3]((3,6,9),(12,15,18),(21,24,27)) m1 * 1. = [3,3]((1,2,3),(4,5,6),(7,8,9)) m1 * N = [3,3]((3,6,9),(12,15,18),(21,24,27)) m1 / 2. = [3,3]((0.5,1,1.5),(2,2.5,3),(3.5,4,4.5)) m1 / N = [3,3]((0.333333,0.666667,1),(1.33333,1.66667,2),(2.33333,2.66667,3))
326 lines
11 KiB
C++
326 lines
11 KiB
C++
//
|
|
// Copyright (c) 2000-2002
|
|
// Joerg Walter, Mathias Koch
|
|
//
|
|
// 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)
|
|
//
|
|
// The authors gratefully acknowledge the support of
|
|
// GeNeSys mbH & Co. KG in producing this work.
|
|
//
|
|
|
|
#include "test1.hpp"
|
|
|
|
// Test matrix expression templates
|
|
template<class M, int N>
|
|
struct test_my_matrix {
|
|
typedef typename M::value_type value_type;
|
|
|
|
template<class VP>
|
|
void test_container_with (VP &v1) const {
|
|
// Container type tests in addition to expression types
|
|
// Insert and erase
|
|
v1.insert_element (0,0, 55);
|
|
v1.erase_element (1,1);
|
|
v1.clear ();
|
|
}
|
|
|
|
template<class MP>
|
|
void test_expression_with (MP &m1, MP &m2, MP &m3) const {
|
|
value_type t;
|
|
|
|
// Default Construct
|
|
default_construct<MP>::test ();
|
|
|
|
// Copy and swap
|
|
initialize_matrix (m1);
|
|
initialize_matrix (m2);
|
|
m1 = m2;
|
|
std::cout << "m1 = m2 = " << m1 << std::endl;
|
|
m1.assign_temporary (m2);
|
|
std::cout << "m1.assign_temporary (m2) = " << m1 << std::endl;
|
|
m1.swap (m2);
|
|
std::cout << "m1.swap (m2) = " << m1 << " " << m2 << std::endl;
|
|
|
|
// Zero assignment
|
|
m1 = ublas::zero_matrix<> (m1.size1 (), m1.size2 ());
|
|
std::cout << "m1.zero_matrix = " << m1 << std::endl;
|
|
m1 = m2;
|
|
|
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
|
// Project range and slice
|
|
initialize_matrix (m1);
|
|
initialize_matrix (m2);
|
|
project (m1, ublas::range(0,1),ublas::range(0,1)) = project (m2, ublas::range(0,1),ublas::range(0,1));
|
|
project (m1, ublas::range(0,1),ublas::range(0,1)) = project (m2, ublas::slice(0,1,1),ublas::slice(0,1,1));
|
|
project (m1, ublas::slice(2,-1,2),ublas::slice(2,-1,2)) = project (m2, ublas::slice(0,1,2),ublas::slice(0,1,2));
|
|
project (m1, ublas::slice(2,-1,2),ublas::slice(2,-1,2)) = project (m2, ublas::range(0,2),ublas::range(0,2));
|
|
std::cout << "m1 = range/slice " << m1 << std::endl;
|
|
#endif
|
|
|
|
// Unary matrix operations resulting in a matrix
|
|
initialize_matrix (m1);
|
|
m2 = - m1;
|
|
std::cout << "- m1 = " << m2 << std::endl;
|
|
m2 = ublas::conj (m1);
|
|
std::cout << "conj (m1) = " << m2 << std::endl;
|
|
|
|
// Binary matrix operations resulting in a matrix
|
|
initialize_matrix (m1);
|
|
initialize_matrix (m2);
|
|
m3 = m1 + m2;
|
|
std::cout << "m1 + m2 = " << m3 << std::endl;
|
|
m3 = m1 - m2;
|
|
std::cout << "m1 - m2 = " << m3 << std::endl;
|
|
m3 = ublas::element_prod (m1, m2);
|
|
std::cout << "element_prod (m1, m2) = " << m3 << std::endl;
|
|
|
|
// Scaling a matrix
|
|
t = N;
|
|
initialize_matrix (m1);
|
|
m2 = value_type (1.) * m1;
|
|
std::cout << "1. * m1 = " << m2 << std::endl;
|
|
m2 = t * m1;
|
|
std::cout << "N * m1 = " << m2 << std::endl;
|
|
initialize_matrix (m1);
|
|
m2 = m1 * value_type (1.);
|
|
std::cout << "m1 * 1. = " << m2 << std::endl;
|
|
m2 = m1 * t;
|
|
std::cout << "m1 * N = " << m2 << std::endl;
|
|
m2 = m1 / value_type (2.);
|
|
std::cout << "m1 / 2. = " << m2 << std::endl;
|
|
m2 = m1 / t;
|
|
std::cout << "m1 / N = " << m2 << std::endl;
|
|
|
|
// Some assignments
|
|
initialize_matrix (m1);
|
|
initialize_matrix (m2);
|
|
m2 += m1;
|
|
std::cout << "m2 += m1 = " << m2 << std::endl;
|
|
m2 -= m1;
|
|
std::cout << "m2 -= m1 = " << m2 << std::endl;
|
|
m2 = m2 + m1;
|
|
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
|
|
m2 = m2 - m1;
|
|
std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
|
|
m1 *= value_type (1.);
|
|
std::cout << "m1 *= 1. = " << m1 << std::endl;
|
|
m1 *= t;
|
|
std::cout << "m1 *= N = " << m1 << std::endl;
|
|
|
|
// Transpose
|
|
initialize_matrix (m1);
|
|
m2 = ublas::trans (m1);
|
|
std::cout << "trans (m1) = " << m2 << std::endl;
|
|
|
|
// Hermitean
|
|
initialize_matrix (m1);
|
|
m2 = ublas::herm (m1);
|
|
std::cout << "herm (m1) = " << m2 << std::endl;
|
|
|
|
// Matrix multiplication
|
|
initialize_matrix (m1);
|
|
initialize_matrix (m2);
|
|
m3 = ublas::prod (m1, m2);
|
|
std::cout << "prod (m1, m2) = " << m3 << std::endl;
|
|
}
|
|
|
|
void operator () () const {
|
|
M m1 (N, N), m2 (N, N), m3 (N, N);
|
|
test_expression_with (m1, m2, m3);
|
|
test_container_with (m1);
|
|
|
|
#ifdef USE_RANGE
|
|
ublas::matrix_range<M> mr1 (m1, ublas::range (0, N), ublas::range (0, N)),
|
|
mr2 (m2, ublas::range (0, N), ublas::range (0, N)),
|
|
mr3 (m3, ublas::range (0, N), ublas::range (0, N));
|
|
test_expression_with (mr1, mr2, mr3);
|
|
#endif
|
|
|
|
#ifdef USE_SLICE
|
|
ublas::matrix_slice<M> ms1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
|
|
ms2 (m2, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
|
|
ms3 (m3, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
|
|
test_expression_with (ms1, ms2, ms3);
|
|
#endif
|
|
}
|
|
};
|
|
|
|
// Test matrix
|
|
void test_matrix () {
|
|
std::cout << "test_matrix" << std::endl;
|
|
|
|
#ifdef USE_MATRIX
|
|
#ifdef USE_BOUNDED_ARRAY
|
|
#ifdef USE_FLOAT
|
|
std::cout << "float, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<float, ublas::row_major, ublas::bounded_array<float, 3 * 3> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<double, ublas::row_major, ublas::bounded_array<double, 3 * 3> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<float>, ublas::row_major, ublas::bounded_array<std::complex<float>, 3 * 3> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<double>, ublas::row_major, ublas::bounded_array<std::complex<double>, 3 * 3> >, 3> () ();
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef USE_UNBOUNDED_ARRAY
|
|
#ifdef USE_FLOAT
|
|
std::cout << "float, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<float, ublas::row_major, ublas::unbounded_array<float> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<double, ublas::row_major, ublas::unbounded_array<double> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<float>, ublas::row_major, ublas::unbounded_array<std::complex<float> > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<double>, ublas::row_major, 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_matrix<ublas::matrix<float, ublas::row_major, std::vector<float> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, std::vector" << std::endl;
|
|
test_my_matrix<ublas::matrix<double, ublas::row_major, std::vector<double> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, std::vector" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<float>, ublas::row_major, std::vector<std::complex<float> > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, std::vector" << std::endl;
|
|
test_my_matrix<ublas::matrix<std::complex<double>, ublas::row_major, std::vector<std::complex<double> > >, 3> () ();
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef USE_BOUNDED_MATRIX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "float, bounded" << std::endl;
|
|
test_my_matrix<ublas::bounded_matrix<float, 3, 3>, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, bounded" << std::endl;
|
|
test_my_matrix<ublas::bounded_matrix<double, 3, 3>, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, bounded" << std::endl;
|
|
test_my_matrix<ublas::bounded_matrix<std::complex<float>, 3, 3>, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, bounded" << std::endl;
|
|
test_my_matrix<ublas::bounded_matrix<std::complex<double>, 3, 3>, 3> () ();
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef USE_VECTOR_OF_VECTOR
|
|
#ifdef USE_BOUNDED_ARRAY
|
|
#ifdef USE_FLOAT
|
|
std::cout << "float, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<float, ublas::row_major, ublas::bounded_array<ublas::bounded_array<float, 3>, 3 + 1> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<double, ublas::row_major, ublas::bounded_array<ublas::bounded_array<double, 3>, 3 + 1> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<float>, ublas::row_major, ublas::bounded_array<ublas::bounded_array<std::complex<float>, 3>, 3 + 1> >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, bounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<double>, ublas::row_major, ublas::bounded_array<ublas::bounded_array<std::complex<double>, 3>, 3 + 1> >, 3> () ();
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef USE_UNBOUNDED_ARRAY
|
|
#ifdef USE_FLOAT
|
|
std::cout << "float, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<float, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<float> > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<double, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<double> > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<float>, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<std::complex<float> > > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, unbounded_array" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<double>, ublas::row_major, ublas::unbounded_array<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_matrix<ublas::vector_of_vector<float, ublas::row_major, std::vector<std::vector<float > > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "double, std::vector" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<double, ublas::row_major, std::vector<std::vector<double> > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_STD_COMPLEX
|
|
#ifdef USE_FLOAT
|
|
std::cout << "std::complex<float>, std::vector" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<float>, ublas::row_major, std::vector<std::vector<std::complex<float> > > >, 3> () ();
|
|
#endif
|
|
|
|
#ifdef USE_DOUBLE
|
|
std::cout << "std::complex<double>, std::vector" << std::endl;
|
|
test_my_matrix<ublas::vector_of_vector<std::complex<double>, ublas::row_major, std::vector<std::vector<std::complex<double> > > >, 3> () ();
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
}
|