Fixed default value in Array's copy constructor (970dd8fa) · Commits · TNL / tnl-dev

src/TNL/Containers/Array.h

+14 −14

Original line number	Diff line number	Diff line
		@@ -112,9 +112,9 @@ class Array
		* \param begin The first index which should be copied.
		* \param size The number of elements that should be copied.
		*/
		Array( Array& array,
		const IndexType& begin,
		IndexType size = -1 );
		Array( const Array& array,
		IndexType begin,
		IndexType size = 0 );

		/**
		* \brief Move constructor for initialization from \e rvalues.
		@@ -481,9 +481,9 @@ class Array
		* \param end The end of the array sub-interval. The default value is 0
		* which is, however, replaced with the array size.
		*/
		void setValue( const Value& v,
		const Index begin = 0,
		Index end = 0 );
		void setValue( const ValueType& v,
		IndexType begin = 0,
		IndexType end = 0 );

		/**
		* \brief Sets the array elements using given lambda function.
		@@ -500,8 +500,8 @@ class Array
		*/
		template< typename Function >
		void evaluate( const Function& f,
		const Index begin = 0,
		Index end = 0 );
		IndexType begin = 0,
		IndexType end = 0 );

		/**
		* \brief Checks if there is an element with value \e v.
		@@ -518,9 +518,9 @@ class Array
		* \return True if there is _at least one_ element in the sub-interval
		* `[begin, end)` which has the value \e v.
		*/
		bool containsValue( const Value& v,
		const Index begin = 0,
		Index end = 0 ) const;
		bool containsValue( const ValueType& v,
		IndexType begin = 0,
		IndexType end = 0 ) const;

		/**
		* \brief Checks if all elements have the same value \e v.
		@@ -537,9 +537,9 @@ class Array
		* \return True if there is _all_ elements in the sub-interval
		* `[begin, end)` have the same value \e v.
		*/
		bool containsOnlyValue( const Value& v,
		const Index begin = 0,
		Index end = 0 ) const;
		bool containsOnlyValue( const ValueType& v,
		IndexType begin = 0,
		IndexType end = 0 ) const;

		/**
		* \brief Returns \e true if the current array size is zero.

src/TNL/Containers/Array.hpp

+35 −21

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@ template< typename Value,
		typename Device,
		typename Index >
		Array< Value, Device, Index >::
		Array( Array< Value, Device, Index >& array,
		const IndexType& begin,
		Array( const Array< Value, Device, Index >& array,
		IndexType begin,
		IndexType size )
		: size( size ),
		data( nullptr ),
		@@ -221,7 +221,7 @@ template< typename Value,
		typename Index >
		void
		Array< Value, Device, Index >::
		setSize( const Index size )
		setSize( Index size )
		{
		TNL_ASSERT_GE( size, (Index) 0, "Array size must be non-negative." );

		@@ -398,7 +398,9 @@ template< typename Value,
		typename Device,
		typename Index >
		__cuda_callable__
		const Value* Array< Value, Device, Index >::getData() const
		const Value*
		Array< Value, Device, Index >::
		getData() const
		{
		return this->data;
		}
		@@ -407,7 +409,9 @@ template< typename Value,
		typename Device,
		typename Index >
		__cuda_callable__
		Value* Array< Value, Device, Index >::getData()
		Value*
		Array< Value, Device, Index >::
		getData()
		{
		return this->data;
		}
		@@ -416,7 +420,9 @@ template< typename Value,
		typename Device,
		typename Index >
		__cuda_callable__
		const Value* Array< Value, Device, Index >::getArrayData() const
		const Value*
		Array< Value, Device, Index >::
		getArrayData() const
		{
		return this->data;
		}
		@@ -425,7 +431,9 @@ template< typename Value,
		typename Device,
		typename Index >
		__cuda_callable__
		Value* Array< Value, Device, Index >::getArrayData()
		Value*
		Array< Value, Device, Index >::
		getArrayData()
		{
		return this->data;
		}
		@@ -592,23 +600,27 @@ operator!=( const ArrayT& array ) const
		template< typename Value,
		typename Device,
		typename Index >
		void Array< Value, Device, Index >::setValue( const ValueType& e,
		const Index begin,
		Index end )
		void
		Array< Value, Device, Index >::
		setValue( const ValueType& v,
		IndexType begin,
		IndexType end )
		{
		TNL_ASSERT_TRUE( this->getData(), "Attempted to set a value of an empty array." );
		if( end == 0 )
		end = this->getSize();
		Algorithms::ArrayOperations< Device >::setMemory( &this->getData()[ begin ], e, end - begin );
		Algorithms::ArrayOperations< Device >::setMemory( &this->getData()[ begin ], v, end - begin );
		}

		template< typename Value,
		typename Device,
		typename Index >
		template< typename Function >
		void Array< Value, Device, Index >::evaluate( const Function& f,
		const Index begin,
		Index end )
		void
		Array< Value, Device, Index >::
		evaluate( const Function& f,
		IndexType begin,
		IndexType end )
		{
		TNL_ASSERT_TRUE( this->getData(), "Attempted to set a value of an empty array." );
		this->getView().evaluate( f, begin, end );
		@@ -619,9 +631,9 @@ template< typename Value,
		typename Index >
		bool
		Array< Value, Device, Index >::
		containsValue( const Value& v,
		const Index begin,
		Index end ) const
		containsValue( const ValueType& v,
		IndexType begin,
		IndexType end ) const
		{
		TNL_ASSERT_TRUE( this->getData(), "Attempted to check a value of an empty array." );
		if( end == 0 )
		@@ -635,9 +647,9 @@ template< typename Value,
		typename Index >
		bool
		Array< Value, Device, Index >::
		containsOnlyValue( const Value& v,
		const Index begin,
		Index end ) const
		containsOnlyValue( const ValueType& v,
		IndexType begin,
		IndexType end ) const
		{
		TNL_ASSERT_TRUE( this->getData(), "Attempted to check a value of an empty array." );
		if( end == 0 )
		@@ -660,7 +672,9 @@ empty() const
		template< typename Value,
		typename Device,
		typename Index >
		void Array< Value, Device, Index >::save( const String& fileName ) const
		void
		Array< Value, Device, Index >::
		save( const String& fileName ) const
		{
		File( fileName, std::ios_base::out ) << *this;
		}