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

More fixes.

Browse Source 
[SVN r17504]
This commit is contained in:
Jörg Walter
2003-02-18 07:34:44 +00:00
parent 93e3edd4c4
commit c7910eb7ef
74 changed files with 2088 additions and 2876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test5/test53.cpp
View File

@@ -127,21 +127,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)),
@@ -154,7 +139,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) {
@@ -171,21 +155,6 @@ struct test_my_matrix {
ublas::triangular_adaptor<M> tam1 (m1), tam2 (m2), tam3 (m3);
(*this) (tam1, tam2, tam3);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#ifdef USE_RANGE
ublas::matrix_range<ublas::triangular_adaptor<M> > mr1 (tam1, ublas::range<> (0, N), ublas::range<> (0, N)),
mr2 (tam2, ublas::range<> (0, N), ublas::range<> (0, N)),
mr3 (tam3, ublas::range<> (0, N), ublas::range<> (0, N));
(*this) (mr1, mr2, mr3);
#endif
#ifdef USE_SLICE
ublas::matrix_slice<ublas::triangular_adaptor<M> > ms1 (tam1, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N)),
ms2 (tam2, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N)),
ms3 (tam3, ublas::slice<> (0, 1, N), ublas::slice<> (0, 1, N));
(*this) (ms1, ms2, ms3);
#endif
#else
#ifdef USE_RANGE
ublas::matrix_range<ublas::triangular_adaptor<M> > mr1 (tam1, ublas::range (0, N), ublas::range (0, N)),
mr2 (tam2, ublas::range (0, N), ublas::range (0, N)),
@@ -198,7 +167,6 @@ struct test_my_matrix {
ms2 (tam2, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
ms3 (tam3, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
(*this) (ms1, ms2, ms3);
#endif
#endif
}
catch (std::exception &e) {