mirror of
https://github.com/boostorg/ublas.git
synced 2026-02-22 15:52:18 +00:00
Many bugfixes and improvements, especially related to sparse matrices.
Thanks namely to Kresimir Fresl and Michael Stevens this time.
This commit is contained in:
@@ -166,46 +166,100 @@ void test_vector () {
|
||||
|
||||
#ifdef USE_SPARSE_VECTOR
|
||||
#ifdef USE_MAP_ARRAY
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "float, map_array" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<float, ublas::map_array<std::size_t, float> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "double, map_array" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<double, ublas::map_array<std::size_t, double> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "std::complex<float>, map_array" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<std::complex<float>, ublas::map_array<std::size_t, std::complex<float> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "std::complex<double>, map_array" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<std::complex<double>, ublas::map_array<std::size_t, std::complex<double> > >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_MAP
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "float, std::map" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<float, std::map<size_t, float> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "double, std::map" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<double, std::map<size_t, double> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "std::complex<float>, std::map" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<std::complex<float>, std::map<size_t, std::complex<float> > >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "std::complex<double>, std::map" << std::endl;
|
||||
test_my_vector<ublas::sparse_vector<std::complex<double>, std::map<size_t, std::complex<double> > > , 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_COMPRESSED_VECTOR
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "float" << std::endl;
|
||||
test_my_vector<ublas::compressed_vector<float>, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "double" << std::endl;
|
||||
test_my_vector<ublas::compressed_vector<double>, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "std::complex<float>" << std::endl;
|
||||
test_my_vector<ublas::compressed_vector<std::complex<float> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "std::complex<double>" << std::endl;
|
||||
test_my_vector<ublas::compressed_vector<std::complex<double> >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_COORDINATE_VECTOR
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "float" << std::endl;
|
||||
test_my_vector<ublas::coordinate_vector<float>, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "double" << std::endl;
|
||||
test_my_vector<ublas::coordinate_vector<double>, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_STD_COMPLEX
|
||||
#ifdef USE_FLOAT
|
||||
std::cout << "std::complex<float>" << std::endl;
|
||||
test_my_vector<ublas::coordinate_vector<std::complex<float> >, 3 > () ();
|
||||
#endif
|
||||
|
||||
#ifdef USE_DOUBLE
|
||||
std::cout << "std::complex<double>" << std::endl;
|
||||
test_my_vector<ublas::coordinate_vector<std::complex<double> >, 3 > () ();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user