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

Extended testing to complex, range and slice where possible

Browse Source 
MSVC and USE_ET cleanup


[SVN r24264]
This commit is contained in:
Michael Stevens
2004-08-03 09:18:11 +00:00
parent f10bea22e6
commit d13aeda439
52 changed files with 87 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jamfile
View File

@@ -74,8 +74,8 @@ test-suite numeric/uBLAS
: # requirements
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
# Test7 check uBLAS operation with interval types.
# This causes to much compiler badness, issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
# Test7 checks uBLAS operation with interval types.
# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
# [ run test7/test7.cpp
# test7/test71.cpp
# test7/test72.cpp

20
Jamfile.v2
View File

@@ -47,15 +47,17 @@ test-suite numeric/uBLAS
test6/test62.cpp
test6/test63.cpp
]
[ run test7/test7.cpp
test7/test71.cpp
test7/test72.cpp
test7/test73.cpp
: # args
: # input files
: # requirements
<define>BOOST_UBLAS_USE_INTERVAL
]
# Test7 checks uBLAS operation with interval types.
# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
# [ run test7/test7.cpp
# test7/test71.cpp
# test7/test72.cpp
# test7/test73.cpp
# : # args
# : # input files
# : # requirements
# <define>BOOST_UBLAS_USE_INTERVAL
# ]
[ compile concepts.cpp
]
;

8
bench1/bench1.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench1/bench11.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench1/bench12.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench1/bench13.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench2/bench2.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench2/bench21.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench2/bench22.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench2/bench23.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench3/bench3.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench3/bench31.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench3/bench32.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench3/bench33.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench4/bench4.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench4/bench41.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench4/bench42.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
bench4/bench43.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <string>

8
test1/test1.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

6
test1/test1.hpp
View File

@@ -43,10 +43,10 @@ void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
#define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY

15
test1/test11.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

12
test1/test12.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -81,11 +73,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 1);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);

15
test1/test13.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -84,17 +76,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1);
initialize_matrix (m2);
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;

8
test2/test2.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

3
test2/test2.hpp
View File

@@ -83,7 +83,8 @@ struct test_blas_3 {
#define USE_FLOAT
#define USE_DOUBLE
#ifndef BOOST_MSVC
// MSVC Version 6.0 & 7.0 have problems with std complex
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
#endif

8
test2/test21.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

8
test2/test22.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

8
test2/test23.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

8
test3/test3.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

9
test3/test3.hpp
View File

@@ -43,13 +43,14 @@ void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
#define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
//FIXME range and slice are failing
//#define USE_RANGE
//#define USE_SLICE
#define USE_MAP_ARRAY
// #define USE_STD_MAP
#define USE_STD_MAP
#define USE_SPARSE_VECTOR
#define USE_COMPRESSED_VECTOR

15
test3/test31.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -90,17 +82,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

12
test3/test32.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -85,11 +77,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, N - 1);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);

15
test3/test33.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -86,17 +78,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1);
initialize_matrix (m2);
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;

8
test4/test4.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

8
test4/test4.hpp
View File

@@ -18,7 +18,7 @@
#define TEST4_H
#define USE_BANDED
// #define USE_DIAGONAL
//#define USE_DIAGONAL
namespace ublas = boost::numeric::ublas;
@@ -51,10 +51,10 @@ void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
#define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY

15
test4/test41.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

20
test4/test42.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -91,11 +83,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 1), mc2 (m1, 1);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);
@@ -123,11 +117,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<ublas::banded_adaptor<M> > mc1 (bam1, 1), mc2 (bam1, 1);
(*this) (mc1, mc2, bam1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<ublas::banded_adaptor<M> > mvr1 (bam1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (bam1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, bam1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<ublas::banded_adaptor<M> > mvs1 (bam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (bam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, bam1);
@@ -145,11 +141,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<ublas::diagonal_adaptor<M> > mc1 (dam1, 1), mc2 (dam1, 1);
(*this) (mc1, mc2, dam1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<ublas::diagonal_adaptor<M> > mvr1 (dam1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (dam1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, dam1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<ublas::diagonal_adaptor<M> > mvs1 (dam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (dam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, dam1);

15
test4/test43.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -83,17 +75,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1);
initialize_matrix (m2);
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;

8
test5/test5.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

6
test5/test5.hpp
View File

@@ -68,10 +68,10 @@ void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
#define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY

15
test5/test51.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

16
test5/test52.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -84,11 +76,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 0);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);
@@ -115,11 +109,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<ublas::triangular_adaptor<M> > mc1 (tam1, 0), mc2 (tam1, 0);
(*this) (mc1, mc2, tam1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<ublas::triangular_adaptor<M> > mvr1 (tam1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (tam1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, tam1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<ublas::triangular_adaptor<M> > mvs1 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, tam1);

15
test5/test53.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -83,17 +75,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1, ublas::lower_tag ());
initialize_matrix (m2, ublas::lower_tag ());
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;

8
test6/test6.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>

15
test6/test61.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -89,17 +81,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

16
test6/test62.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -87,11 +79,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 0);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);
@@ -118,11 +112,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<ublas::symmetric_adaptor<M> > mc1 (tam1, 0), mc2 (tam1, 0);
(*this) (mc1, mc2, tam1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<ublas::symmetric_adaptor<M> > mvr1 (tam1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (tam1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, tam1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<ublas::symmetric_adaptor<M> > mvs1 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, tam1);

15
test6/test63.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/ublas/config.hpp>
@@ -84,17 +76,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1, ublas::lower_tag ());
initialize_matrix (m2, ublas::lower_tag ());
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m1 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;

8
test7/test7.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/interval.hpp>

6
test7/test7.hpp
View File

@@ -43,10 +43,10 @@ void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
#define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY

15
test7/test71.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/interval.hpp>
@@ -90,17 +82,14 @@ struct test_my_vector {
// Some assignments
initialize_vector (v1);
initialize_vector (v2);
#ifdef BOOST_UBLAS_USE_ET
v2 += v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
v2 -= v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#else
v2 = v2 + v1;
std::cout << "v2 += v1 = " << v2 << std::endl;
std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
v2 = v2 - v1;
std::cout << "v2 -= v1 = " << v2 << std::endl;
#endif
std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
v1 *= value_type (1.);
std::cout << "v1 *= 1. = " << v1 << std::endl;
v1 *= t;

12
test7/test72.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <iostream>
#include <boost/numeric/interval.hpp>
@@ -84,11 +76,13 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 1);
(*this) (mc1, mc2, m1);
#ifdef USE_RANGE_AND_SLICE
#ifdef USE_RANGE
ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
(*this) (mvr1, mvr2, m1);
#endif
#ifdef USE_SLICE
ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (mvs1, mvs2, m1);

15
test7/test73.cpp
View File

@@ -14,14 +14,6 @@
// GeNeSys mbH & Co. KG in producing this work.
//
#ifdef BOOST_MSVC
#pragma warning (disable: 4355)
#pragma warning (disable: 4503)
#pragma warning (disable: 4786)
#endif
#include <boost/numeric/interval.hpp>
#include <boost/numeric/interval/io.hpp>
@@ -83,17 +75,14 @@ struct test_my_matrix {
// Some assignments
initialize_matrix (m1);
initialize_matrix (m2);
#ifdef BOOST_UBLAS_USE_ET
m2 += m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
m2 -= m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#else
m2 = m2 + m1;
std::cout << "m2 += m1 = " << m2 << std::endl;
std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
m2 = m2 - m1;
std::cout << "m2 -= m1 = " << m2 << std::endl;
#endif
std::cout << "m2 = m1 - m1 = " << m2 << std::endl;
m1 *= value_type (1.);
std::cout << "m1 *= 1. = " << m1 << std::endl;
m1 *= t;