Commit Graph

4026 Commits

Author SHA1 Message Date
Joaquim Duran
4c02ee4fc3 Merge remote-tracking branch 'origin/develop' into ublas_feature0010_ide_dev_support
Conflicts:
	test/test_assignment.cpp
	test/test_coordinate_matrix_inplace_merge.cpp
	test/test_coordinate_vector_inplace_merge.cpp
2014-11-09 14:37:02 +01:00
Joaquim Duran
2badf5ad5e Merge remote-tracking branch 'upstream/develop' into develop 2014-11-09 01:09:55 +01:00
Joaquim Duran
ffe1ec9d3a Functions mean_square have been moved to 'testhelper.hpp'. Created the functions 'equal_to' to test if matrices or vectors are equals (based on mean_square). 2014-11-08 15:54:22 +01:00
Joaquim Duran
08e64804bd The matrices and vectors compared should have the same size. 2014-11-06 00:51:35 +01:00
David Bellot
b5ede30b8b Merge pull request #15 from jdurancomas/develop
Develop
2014-11-03 10:29:18 +00:00
David Bellot
741db0493f Merge pull request #13 from jdurancomas/ublas_feature0010_ide_dev_support
Ublas feature0010 ide dev support
2014-11-03 08:38:46 +00:00
Joaquim Duran
b6565a2d24 The warnings about unused variables in tests and benchmarks have been fixed. 2014-11-02 15:55:32 +01:00
Joaquim Duran
780bc3f97a Added interval.hpp header to compile when interval is used (BOOST_UBLAS_USE_INTERVAL defined). 2014-11-02 15:41:42 +01:00
Joaquim Duran
a0fa1e6547 The relative path in the include directive to locate the header utils.hpp has been removed. 2014-10-31 02:20:35 +01:00
qduran
b93d429102 The configuration of bench tests has been placed in shared configuration.pri file. 2014-10-16 02:22:22 +02:00
qduran
5b7b11c774 Merge branch 'origin/develop' into HEAD 2014-10-16 00:26:53 +02:00
David Bellot
30c5da8988 Merge pull request #12 from uBLAS/develop
Develop
2014-10-15 09:53:09 +01:00
David Bellot
9465675c6d Merge pull request #14 from boostorg/develop
ublas 1.57 final
2014-10-15 09:48:53 +01:00
David Bellot
fffbeb1543 Merge pull request #13 from uBLAS/develop
merged ublas:develop into boostorg:develop
2014-10-15 09:21:19 +01:00
qduran
5f24feb364 Added configuration file to tests. 2014-10-09 02:24:59 +02:00
qduran
77b9321e48 Changes implemented:
1 - Test programs are executed automatically once compliled.

2 - To compile tests and brenchs, headers files of ublas source code are included.

3 - If ublas tests and brenchs are build with modular boost source code, the header files of boost source code are included and its libraries are linked.

4 - Created configuration.pri file to centralize the configuration of tests .pro files.
2014-10-09 02:22:27 +02:00
David Bellot
a8fde21e5a Merge pull request #11 from jdurancomas/develop
Remove the name of unused function parameters to avoid warnings in the c...
2014-10-05 21:39:03 +01:00
qduran
1382b820da Merge branch 'develop' of https://github.com/jdurancomas/ublas into origin/develop 2014-10-05 21:53:37 +02:00
jdurancomas
349c1211cd Merge pull request #2 from uBLAS/develop
Develop
2014-10-05 21:51:48 +02:00
qduran
ba71d594c9 Merge remote-tracking branch 'upstream/develop' into origin/develop 2014-10-05 20:08:54 +02:00
qduran
a069526f89 Remove the name of unused function parameters to avoid warnings in the compilation. 2014-10-05 19:23:44 +02:00
David Bellot
277e1b567a Merge pull request #12 from uBLAS/develop
Develop
2014-10-05 09:59:01 +01:00
nasos
df3a82abbf Changed test33 to avoid conversion warning in MSVC 2014-09-30 09:49:27 -04:00
nasos
f9081229ea Merge branch 'bugfix_matrix_vector_struct_class' into develop 2014-09-30 09:38:38 -04:00
nasos
6b8b71466e Changed matrix_vector_iterator from a struct to a class to avoid warning on MSVC 2014-09-30 09:38:07 -04:00
qduran
11d7b5d28d Build tests test_fixed_containers and test_matrix_vector. 2014-09-29 01:15:26 +02:00
David Bellot
334518b14f Merge pull request #11 from uBLAS/develop
Develop
2014-09-28 12:45:46 +01:00
David Bellot
196156650e fixed index.html 2014-09-28 12:42:36 +01:00
David Bellot
8855d46dc1 Merge pull request #9 from boostorg/develop
Develop
2014-09-28 12:22:20 +01:00
David Bellot
2677daba97 Merge branch 'develop' of https://github.com/uBLAS/ublas into UBLAS-develop
Conflicts:
	doc/index.html
	index.html
2014-09-28 11:35:41 +01:00
David Bellot
d11aa8e29f Merge pull request #8 from jdurancomas/develop
Improved documentation of matrix_vector.hpp
2014-09-28 10:58:57 +01:00
David Bellot
05a2654462 conflicts in doc resolved manually 2014-09-28 10:41:21 +01:00
David Bellot
05b5b523f0 manually resolving conflict with doc/html/index.html 2014-09-28 10:37:25 +01:00
David Bellot
68c7cebb03 remove last piece of doxygen 2014-09-28 10:22:42 +01:00
Joaquim Duran
cd2058eedd Merge remote-tracking branch 'origin/develop' into HEAD
Conflicts:
	IDEs/qtcreator/include/include.pro
	IDEs/qtcreator/test/test.pro
2014-09-28 11:15:27 +02:00
jdurancomas
3cf5a63306 Merge pull request #1 from uBLAS/ublas_feature0010_ide_dev_support
Ublas feature0010 ide dev support
2014-09-28 01:43:45 +02:00
qduran
83d6a3d167 Improved documentation of matrix_vector.hpp 2014-09-26 01:53:37 +02:00
Nasos
9cd2358f24 Update Changelog 2014-09-16 11:44:19 -04:00
Nasos
e30ef6c7cc Update Changelog 2014-09-16 11:38:28 -04:00
nasos
608478a093 Merged ublas_feature0011_mvrange_interface_t7411 2014-09-16 11:08:59 -04:00
David Bellot
1360e329d2 * merge pull request from Daniel James: metadata file
* removed out-dated and too big doxygen documentation
* change maintainers name in metadata
2014-09-13 10:33:36 +01:00
David Bellot
8bd88abfb1 Merge pull request #7 from danieljames/metadata
Create metadata file.
2014-09-13 10:25:36 +01:00
David Bellot
d3d28d8dfd Merge pull request #7 from jdurancomas/develop
Implemented cbegin, cend, crbegin and crend member functions in matrices, vectors and storage.
2014-09-13 08:44:48 +01:00
David Bellot
9b97b6f0e3 Merge pull request #6 from MarcelRaad/develop
Fix warnings for MSVC14
2014-09-13 08:41:51 +01:00
David Bellot
00ccc91eea Merge pull request #6 from jdurancomas/remotes/origin/ublas_feature0011_mvrange_interface_t7411
Remotes/origin/ublas feature0011 mvrange interface t7411
2014-09-13 08:41:04 +01:00
David Bellot
c03f378190 Merge pull request #5 from jdurancomas/remotes/origin/ublas_feature0010_ide_dev_support
Remotes/origin/ublas feature0010 ide dev support
2014-09-13 08:39:14 +01:00
Daniel James
3089f42eaa Add metadata file. 2014-08-18 15:08:20 +01:00
qduran
94f357d98b Merge remote-tracking branch 'upstream/develop' into develop 2014-08-11 19:21:10 +02:00
qduran
a359338650 Implemented cbegin, cend, crbegin and crend in storage files. 2014-08-11 18:57:13 +02:00
qduran
1223d83089 Implemented cbegin, cend, crbegin and crend in matrices files. 2014-08-11 18:55:33 +02:00