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

16
test6/Jamfile
View File

@@ -1,3 +1,19 @@
#
# Copyright (c) 2000-2002
# Joerg Walter, Mathias Koch
#
# Permission to use, copy, modify, distribute and sell this software
# and its documentation for any purpose is hereby granted without fee,
# provided that the above copyright notice appear in all copies and
# that both that copyright notice and this permission notice appear
# in supporting documentation. The authors make no representations
# about the suitability of this software for any purpose.
# It is provided "as is" without express or implied warranty.
#
# The authors gratefully acknowledge the support of
# GeNeSys mbH & Co. KG in producing this work.
#
subproject libs/numeric/ublas/test6 ;
SOURCES = test6 test61 test62 test63 ;

16
test6/test61.cpp
View File

@@ -137,21 +137,6 @@ struct test_my_vector {
V v1 (N), v2 (N), v3 (N);
(*this) (v1, v2, v3);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#ifdef USE_RANGE
ublas::vector_range<V> vr1 (v1, ublas::range<> (0, N)),
vr2 (v2, ublas::range<> (0, N)),
vr3 (v3, ublas::range<> (0, N));
(*this) (vr1, vr2, vr3);
#endif
#ifdef USE_SLICE
ublas::vector_slice<V> vs1 (v1, ublas::slice<> (0, 1, N)),
vs2 (v2, ublas::slice<> (0, 1, N)),
vs3 (v3, ublas::slice<> (0, 1, N));
(*this) (vs1, vs2, vs3);
#endif
#else
#ifdef USE_RANGE
ublas::vector_range<V> vr1 (v1, ublas::range (0, N)),
vr2 (v2, ublas::range (0, N)),
@@ -164,7 +149,6 @@ struct test_my_vector {
vs2 (v2, ublas::slice (0, 1, N)),
vs3 (v3, ublas::slice (0, 1, N));
(*this) (vs1, vs2, vs3);
#endif
#endif
}
catch (std::exception &e) {

24
test6/test62.cpp
View File

@@ -87,17 +87,6 @@ struct test_my_matrix_vector {
ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 0);
(*this) (mc1, mc2, m1);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#ifdef USE_RANGE_AND_SLICE
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);
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);
#endif
#else
#ifdef USE_RANGE_AND_SLICE
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));
@@ -106,7 +95,6 @@ struct test_my_matrix_vector {
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);
#endif
#endif
}
catch (std::exception &e) {
@@ -130,17 +118,6 @@ struct test_my_matrix_vector {
ublas::matrix_column<ublas::symmetric_adaptor<M> > mc1 (tam1, 0), mc2 (tam1, 0);
(*this) (mc1, mc2, tam1);
#ifdef BOOST_UBLAS_ENABLE_INDEX_SET_ALL
#ifdef USE_RANGE_AND_SLICE
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);
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);
#endif
#else
#ifdef USE_RANGE_AND_SLICE
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));
@@ -149,7 +126,6 @@ struct test_my_matrix_vector {
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);
#endif
#endif
}
catch (std::exception &e) {

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) {