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

More fixes.

Browse Source
This commit is contained in:
Jörg Walter
2003-02-18 07:34:44 +00:00
parent 4ae29ffca5
commit 096ac8dbf2
74 changed files with 2088 additions and 2876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test6/test63.cpp
View File

@@ -128,21 +128,6 @@ struct test_my_matrix {
M m1 (N, N), m2 (N, N), m3 (N, N);
(*this) (m1, m2, m3);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#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));
(*this) (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));
(*this) (ms1, ms2, ms3);
#endif
#else
#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)),
@@ -155,7 +140,6 @@ struct test_my_matrix {
ms2 (m2, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
ms3 (m3, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (ms1, ms2, ms3);
#endif
#endif
}
catch (std::exception &e) {
@@ -172,21 +156,6 @@ struct test_my_matrix {
ublas::symmetric_adaptor<M> sam1 (m1), sam2 (m2), sam3 (m3);
(*this) (sam1, sam2, sam3);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#ifdef USE_RANGE
ublas::matrix_range<ublas::symmetric_adaptor<M> > mr1 (sam1, ublas::range<> (0, N), ublas::range<> (0, N)),
mr2 (sam2, ublas::range<> (0, N), ublas::range<> (0, N)),
mr3 (sam3, ublas::range<> (0, N), ublas::range<> (0, N));
(*this) (mr1, mr2, mr3);
#endif
#ifdef USE_SLICE
ublas::matrix_slice<ublas::symmetric_adaptor<M> > ms1 (sam1, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N)),
ms2 (sam2, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N)),
ms3 (sam3, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N));
(*this) (ms1, ms2, ms3);
#endif
#else
#ifdef USE_RANGE
ublas::matrix_range<ublas::symmetric_adaptor<M> > mr1 (sam1, ublas::range (0, N), ublas::range (0, N)),
mr2 (sam2, ublas::range (0, N), ublas::range (0, N)),
@@ -199,7 +168,6 @@ struct test_my_matrix {
ms2 (sam2, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
ms3 (sam3, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (ms1, ms2, ms3);
#endif
#endif
}
catch (std::exception &e) {