diff --git a/Documentation/Examples/Containers/VectorExample.cpp b/Documentation/Examples/Containers/VectorExample.cpp index 798774c17c369218e2cd1c886452bbd2471d0a85..be2db767afcdabff51e7d6038674ae011285de4b 100644 --- a/Documentation/Examples/Containers/VectorExample.cpp +++ b/Documentation/Examples/Containers/VectorExample.cpp @@ -7,16 +7,15 @@ using namespace std; int main() { - Containers::Vector<int> vector1; - vector1.setSize(5); - vector1.setValue(0); - cout << "Does vector contain 1?" << vector1.containsValue(1) << endl; - cout << "Does vector contain only zeros?" << vector1.containsOnlyValue(0) << endl; + Containers::Vector<int> vector1( 5 ); + vector1 = 0; + cout << "Does vector contain 1?" << vector1.containsValue( 1 ) << endl; + cout << "Does vector contain only zeros?" << vector1.containsOnlyValue( 0 ) << endl; - Containers::Vector<int> vector2(3); - vector2.setValue(1); - vector2.swap(vector1); - vector2.setElement(2,4); + Containers::Vector<int> vector2( 3 ); + vector2 = 1; + vector2.swap( vector1 ); + vector2.setElement( 2, 4 ); cout << "First vector:" << vector1.getData() << endl; cout << "Second vector:" << vector2.getData() << endl; @@ -24,10 +23,11 @@ int main() vector2.reset(); cout << "Second vector after reset:" << vector2.getData() << endl; - /*Containers::Vector<int> vect = {1, 2, -3, 3}; - cout << "The smallest element is:" << vect.min() << endl; - cout << "The absolute biggest element is:" << vect.absMax() << endl; - cout << "Sum of all vector elements:" << vect.sum() << endl; - vect.scalarMultiplication(2);*/ + Containers::Vector<int> vect = { 1, 2, -3, 3 }; + cout << "The smallest element is:" << min( vect ) << endl; + cout << "The absolute biggest element is:" << max( abs( vect ) ) << endl; + cout << "Sum of all vector elements:" << sum( vect ) << endl; + vect *= 2.0; + cout << "Vector multiplied by 2:" << vect << endl; } diff --git a/src/TNL/Containers/Vector.h b/src/TNL/Containers/Vector.h index be08266b61bc42555f9b78cd5471bce7f31f5b43..6bec6932115b03a47696de90a7a560c31762c4a2 100644 --- a/src/TNL/Containers/Vector.h +++ b/src/TNL/Containers/Vector.h @@ -32,7 +32,9 @@ namespace Containers { * is selected with \ref Allocators::Default. * * \par Example - * \include VectorExample.cpp + * \include Containers/VectorExample.cpp + * \par Output + * \include VectorExample.out */ template< typename Real = double, typename Device = Devices::Host,