mirror of
https://github.com/boostorg/ublas.git
synced 2026-02-22 15:52:18 +00:00
complex<interval> is not supported by std::complex. A boost:complex was assumed.
This does not and probably never will exist. Removed code relying on this. It is untested and the macro's to enable it inconsistent
This commit is contained in:
@@ -694,207 +694,10 @@ namespace boost { namespace numeric { namespace ublas {
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct type_traits<boost::complex<boost::numeric::interval<float> > > {
|
||||
typedef type_traits<boost::complex<boost::numeric::interval<float> > > self_type;
|
||||
typedef boost::complex<boost::numeric::interval<float> > value_type;
|
||||
typedef const value_type &const_reference;
|
||||
typedef value_type &reference;
|
||||
typedef boost::numeric::interval<float> real_type;
|
||||
typedef boost::complex<boost::numeric::interval<double> > precision_type;
|
||||
|
||||
static const unsigned plus_complexity = 2;
|
||||
static const unsigned multiplies_complexity = 6;
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type real (const_reference t) {
|
||||
return std::real (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type imag (const_reference t) {
|
||||
return std::imag (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type conj (const_reference t) {
|
||||
return std::conj (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type abs (const_reference t) {
|
||||
return boost::numeric::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type sqrt (const_reference t) {
|
||||
return boost::numeric::sqrt (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_1 (const_reference t) {
|
||||
return type_traits<real_type>::abs (self_type::real (t)) +
|
||||
type_traits<real_type>::abs (self_type::imag (t));
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_2 (const_reference t) {
|
||||
return self_type::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_inf (const_reference t) {
|
||||
return (std::max) (type_traits<real_type>::abs (self_type::real (t)),
|
||||
type_traits<real_type>::abs (self_type::imag (t)));
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
bool equals (const_reference t1, const_reference t2) {
|
||||
return self_type::norm_inf (t1 - t2) < BOOST_UBLAS_TYPE_CHECK_EPSILON *
|
||||
(std::max) ((std::max) (self_type::norm_inf (t1),
|
||||
self_type::norm_inf (t2)),
|
||||
BOOST_UBLAS_TYPE_CHECK_MIN);
|
||||
}
|
||||
};
|
||||
template<>
|
||||
struct type_traits<boost::complex<boost::numeric::interval<double> > {
|
||||
typedef type_traits<boost::complex<boost::numeric::interval<double> > self_type;
|
||||
typedef boost::complex<boost::numeric::interval<double> > value_type;
|
||||
typedef const value_type &const_reference;
|
||||
typedef value_type &reference;
|
||||
typedef boost::numeric::interval<double> real_type;
|
||||
typedef boost::complex<boost::numeric::interval<long double> > precision_type;
|
||||
|
||||
static const unsigned plus_complexity = 2;
|
||||
static const unsigned multiplies_complexity = 6;
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type real (const_reference t) {
|
||||
return std::real (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type imag (const_reference t) {
|
||||
return std::imag (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type conj (const_reference t) {
|
||||
return std::conj (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type abs (const_reference t) {
|
||||
return boost::numeric::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type sqrt (const_reference t) {
|
||||
return boost::numeric::sqrt (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_1 (const_reference t) {
|
||||
return type_traits<real_type>::abs (self_type::real (t)) +
|
||||
type_traits<real_type>::abs (self_type::imag (t));
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_2 (const_reference t) {
|
||||
return self_type::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_inf (const_reference t) {
|
||||
return (std::max) (type_traits<real_type>::abs (self_type::real (t)),
|
||||
type_traits<real_type>::abs (self_type::imag (t)));
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
bool equals (const_reference t1, const_reference t2) {
|
||||
return self_type::norm_inf (t1 - t2) < BOOST_UBLAS_TYPE_CHECK_EPSILON *
|
||||
(std::max) ((std::max) (self_type::norm_inf (t1),
|
||||
self_type::norm_inf (t2)),
|
||||
BOOST_UBLAS_TYPE_CHECK_MIN);
|
||||
}
|
||||
};
|
||||
template<>
|
||||
struct type_traits<boost::complex<boost::numeric::interval<long double> > > {
|
||||
typedef type_traits<boost::complex<boost::numeric::interval<long double> > > self_type;
|
||||
typedef boost::complex<boost::numeric::interval<long double> > value_type;
|
||||
typedef const value_type &const_reference;
|
||||
typedef value_type &reference;
|
||||
typedef boost::numeric::interval<long double> real_type;
|
||||
typedef value_type precision_type;
|
||||
|
||||
static const unsigned plus_complexity = 2;
|
||||
static const unsigned multiplies_complexity = 6;
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type real (const_reference t) {
|
||||
return std::real (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type imag (const_reference t) {
|
||||
return std::imag (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type conj (const_reference t) {
|
||||
return std::conj (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type abs (const_reference t) {
|
||||
return boost::numeric::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
value_type sqrt (const_reference t) {
|
||||
return boost::numeric::sqrt (t);
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_1 (const_reference t) {
|
||||
return type_traits<real_type>::abs (self_type::real (t)) +
|
||||
type_traits<real_type>::abs (self_type::imag (t));
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_2 (const_reference t) {
|
||||
return self_type::abs (t);
|
||||
}
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
real_type norm_inf (const_reference t) {
|
||||
return (std::max) (type_traits<real_type>::abs (self_type::real (t)),
|
||||
type_traits<real_type>::abs (self_type::imag (t)));
|
||||
}
|
||||
|
||||
static
|
||||
BOOST_UBLAS_INLINE
|
||||
bool equals (const_reference t1, const_reference t2) {
|
||||
return self_type::norm_inf (t1 - t2) < BOOST_UBLAS_TYPE_CHECK_EPSILON *
|
||||
(std::max) ((std::max) (self_type::norm_inf (t1),
|
||||
self_type::norm_inf (t2)),
|
||||
BOOST_UBLAS_TYPE_CHECK_MIN);
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
// Storage tags -- hierarchical definition of storage characteristics
|
||||
|
||||
struct unknown_storage_tag {};
|
||||
struct sparse_proxy_tag: public unknown_storage_tag {};
|
||||
@@ -962,6 +765,9 @@ namespace boost { namespace numeric { namespace ublas {
|
||||
typedef sparse_proxy_tag storage_category;
|
||||
};
|
||||
|
||||
|
||||
// Iterator tags -- hierarchical definition of storage characteristics
|
||||
|
||||
struct sparse_bidirectional_iterator_tag : public std::bidirectional_iterator_tag {};
|
||||
struct packed_random_access_iterator_tag : public std::random_access_iterator_tag {};
|
||||
struct dense_random_access_iterator_tag : public packed_random_access_iterator_tag {};
|
||||
|
||||
@@ -23,7 +23,9 @@
|
||||
#include <boost/numeric/interval/io.hpp>
|
||||
|
||||
#include <boost/numeric/ublas/vector.hpp>
|
||||
#include <boost/numeric/ublas/vector_proxy.hpp>
|
||||
#include <boost/numeric/ublas/matrix.hpp>
|
||||
#include <boost/numeric/ublas/matrix_proxy.hpp>
|
||||
#include <boost/numeric/ublas/io.hpp>
|
||||
|
||||
namespace ublas = boost::numeric::ublas;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
//
|
||||
// Copyright (c) 2000-2002
|
||||
// Joerg Walter, Mathias Koch
|
||||
//
|
||||
@@ -61,12 +60,12 @@ struct test_my_vector {
|
||||
initialize_vector (v1);
|
||||
v2 = value_type (1.) * v1;
|
||||
std::cout << "1. * v1 = " << v2 << std::endl;
|
||||
v2 = t * v1;
|
||||
// v2 = t * v1;
|
||||
std::cout << "N * v1 = " << v2 << std::endl;
|
||||
initialize_vector (v1);
|
||||
v2 = v1 * value_type (1.);
|
||||
// v2 = v1 * value_type (1.);
|
||||
std::cout << "v1 * 1. = " << v2 << std::endl;
|
||||
v2 = v1 * t;
|
||||
// v2 = v1 * t;
|
||||
std::cout << "v1 * N = " << v2 << std::endl;
|
||||
|
||||
// Some assignments
|
||||
@@ -142,18 +141,6 @@ void test_vector () {
|
||||
std::cout << "boost::numeric::interval<double>, bounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::numeric::interval<double>, ublas::bounded_array<boost::numeric::interval<double>, 3> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, bounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, bounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3> >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNBOUNDED_ARRAY
|
||||
@@ -166,18 +153,6 @@ void test_vector () {
|
||||
std::cout << "boost::numeric::interval<double>, unbounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::numeric::interval<double>, ublas::unbounded_array<boost::numeric::interval<double> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, unbounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, unbounded_array" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_VECTOR
|
||||
@@ -190,17 +165,5 @@ void test_vector () {
|
||||
std::cout << "boost::numeric::interval<double>, std::vector" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::numeric::interval<double>, std::vector<boost::numeric::interval<double> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, std::vector" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, std::vector<boost::complex<boost::numeric::interval<float> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, std::vector" << std::endl;
|
||||
test_my_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, std::vector<boost::complex<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -92,20 +92,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, ublas::bounded_array<boost::numeric::interval<double>, 3> >,
|
||||
ublas::matrix<boost::numeric::interval<double>, ublas::row_major, ublas::bounded_array<boost::numeric::interval<double>, 3 * 3> >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, bounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3> >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3 * 3> >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, bounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3> >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3 * 3> >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNBOUNDED_ARRAY
|
||||
@@ -120,20 +106,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, ublas::unbounded_array<boost::numeric::interval<double> > >,
|
||||
ublas::matrix<boost::numeric::interval<double>, ublas::row_major, ublas::unbounded_array<boost::numeric::interval<double> > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, unbounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, unbounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_VECTOR
|
||||
@@ -148,20 +120,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, std::vector<boost::numeric::interval<double> > >,
|
||||
ublas::matrix<boost::numeric::interval<double>, ublas::row_major, std::vector<boost::numeric::interval<double> > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, std::vector" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, std::vector<boost::complex<boost::numeric::interval<float> > > >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, std::vector<boost::complex<boost::numeric::interval<float> > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, std::vector" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, std::vector<boost::complex<boost::numeric::interval<double> > > >,
|
||||
ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, std::vector<boost::complex<boost::numeric::interval<double> > > >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -178,20 +136,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, ublas::bounded_array<boost::numeric::interval<double>, 3> >,
|
||||
ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::numeric::interval<double>, 3>, 3 + 1> >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, bounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3> >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3>, 3 + 1> >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, bounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3> >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3>, 3 + 1> >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNBOUNDED_ARRAY
|
||||
@@ -206,20 +150,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, ublas::unbounded_array<boost::numeric::interval<double> > >,
|
||||
ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::numeric::interval<double> > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, unbounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, unbounded_array" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > > >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_VECTOR
|
||||
@@ -234,20 +164,6 @@ void test_matrix_vector () {
|
||||
test_my_matrix_vector<ublas::vector<boost::numeric::interval<double>, std::vector<boost::numeric::interval<double> > >,
|
||||
ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, std::vector<std::vector<boost::numeric::interval<double> > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, std::vector" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<float> >, std::vector<boost::complex<boost::numeric::interval<float> > > >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, std::vector<std::vector<boost::complex<boost::numeric::interval<float> > > > >, 3> () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, std::vector" << std::endl;
|
||||
test_my_matrix_vector<ublas::vector<boost::complex<boost::numeric::interval<double> >, std::vector<boost::complex<boost::numeric::interval<double> > > >,
|
||||
ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, std::vector<std::vector<boost::complex<boost::numeric::interval<double> > > > >, 3> () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -134,18 +134,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::numeric::interval<double>, ublas::row_major, ublas::bounded_array<boost::numeric::interval<double>, 3 * 3> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef BOOST_UBLAS_NEED_ANOTHER_COMPLEX_CLASS
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3 * 3> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3 * 3> >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNBOUNDED_ARRAY
|
||||
@@ -158,18 +146,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::numeric::interval<double>, ublas::row_major, ublas::unbounded_array<boost::numeric::interval<double> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_VECTOR
|
||||
@@ -182,18 +158,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::numeric::interval<double>, ublas::row_major, std::vector<boost::numeric::interval<double> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<float> >, ublas::row_major, std::vector<boost::complex<boost::numeric::interval<float> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::matrix<boost::complex<boost::numeric::interval<double> >, ublas::row_major, std::vector<boost::complex<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -208,18 +172,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::numeric::interval<double>, 3>, 3 + 1> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::complex<boost::numeric::interval<float> >, 3>, 3 + 1> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, bounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::bounded_array<ublas::bounded_array<boost::complex<boost::numeric::interval<double> >, 3>, 3 + 1> >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNBOUNDED_ARRAY
|
||||
@@ -232,18 +184,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::complex<boost::numeric::interval<float> > > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, unbounded_array" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, ublas::unbounded_array<ublas::unbounded_array<boost::complex<boost::numeric::interval<double> > > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_VECTOR
|
||||
@@ -256,18 +196,6 @@ void test_matrix () {
|
||||
std::cout << "boost::numeric::interval<double>, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::numeric::interval<double>, ublas::row_major, std::vector<std::vector<boost::numeric::interval<double> > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_BOOST_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "boost::complex<boost::numeric::interval<float> >, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<float> >, ublas::row_major, std::vector<std::vector<boost::complex<boost::numeric::interval<float> > > > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "boost::complex<boost::numeric::interval<double> >, std::vector" << std::endl;
|
||||
test_my_matrix<ublas::vector_of_vector<boost::complex<boost::numeric::interval<double> >, ublas::row_major, std::vector<std::vector<boost::complex<boost::numeric::interval<double> > > > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user