Resolve internal issue 448: internal set getinitialized to be invoked via matrixbase (#22)

* Implement get/setInitialized call through MatrixBase
* Add a const qualifier for boolean argument of existing setInitialized signatures.
* Add 'initialized' field to MatrixFunctor
* Add get/setInitialized to MatrixFunctor
* Annotate that initialized field in MatrixFunctor is a temporary solution

Author: Vladimir Dimic

include/alp/reference/blas3.hpp

@@ -1095,6 +1095,7 @@ namespace alp {
 			imf::Id, imf::Id,
 			reference
 			>(
+				internal::getInitialized( x ) && internal::getInitialized( y ), // Temporary solution, pending proper implemention
 				lambda,
 				imf::Id( getLength( x ) ),
 				imf::Id( getLength( y ) )
@@ -1145,6 +1146,7 @@ namespace alp {
 			imf::Id, imf::Id,
 			reference
 			>(
+				internal::getInitialized( x ),
 				lambda,
 				imf::Id( getLength( x ) )
 			);

include/alp/reference/matrix.hpp

@@ -100,7 +100,7 @@ namespace alp {
 		}
 
 		template< typename D >
-		void setInitialized( alp::internal::Matrix< D, reference > & A, bool initialized ) noexcept {
+		void setInitialized( alp::internal::Matrix< D, reference > & A, const bool initialized ) noexcept {
 			A.initialized = initialized;
 		}
 
@@ -145,7 +145,7 @@ namespace alp {
 			friend const bool & internal::getInitialized( const alp::internal::Matrix< DataType, reference > & ) noexcept;
 
 			template< typename DataType >
-			friend void internal::setInitialized( alp::internal::Matrix< DataType, reference > & , bool ) noexcept;
+			friend void internal::setInitialized( alp::internal::Matrix< DataType, reference > & , const bool ) noexcept;
 
 			typedef Matrix< D, reference > self_type;
 
@@ -392,21 +392,11 @@ namespace alp {
 		template< typename DerivedMatrix >
 		std::pair< size_t, size_t > dims( const MatrixBase< DerivedMatrix > & A ) noexcept;
 
-		// template< typename DerivedMatrix >
-		// bool getInitialized( MatrixBase< DerivedMatrix > & ) noexcept;
-
-		// template< typename DerivedMatrix >
-		// void getInitialized( MatrixBase< DerivedMatrix > &, bool ) noexcept;
-
-		template< typename T, typename Structure, enum Density density, typename View, typename ImfR, typename ImfC >
-		bool getInitialized( const alp::Matrix< T, Structure, density, View, ImfR, ImfC, reference > & A ) noexcept {
-			return internal::getInitialized( internal::getContainer( A ) );
-		}
+		template< typename MatrixType >
+		bool getInitialized( const MatrixType &A ) noexcept;
 
-		template< typename T, typename Structure, enum Density density, typename View, typename ImfR, typename ImfC >
-		void setInitialized( alp::Matrix< T, Structure, density, View, ImfR, ImfC, reference > & A, bool initialized ) noexcept {
-			internal::setInitialized( internal::getContainer( A ), initialized );
-		}
+		template< typename MatrixType >
+		void setInitialized( MatrixType &, const bool ) noexcept;
 
 	} // namespace internal
 
@@ -439,6 +429,12 @@ namespace alp {
 
 			friend std::pair< size_t, size_t > dims<>( const MatrixBase< DerivedMatrix > &A ) noexcept;
 
+			template< typename MatrixType >
+			friend bool getInitialized( const MatrixType &A ) noexcept;
+
+			template< typename MatrixType >
+			friend void setInitialized( MatrixType &A, const bool initialized ) noexcept;
+
 			protected:
 
 				std::pair< size_t, size_t > dims() const noexcept {
@@ -454,6 +450,15 @@ namespace alp {
 				template< typename MatrixType >
 				friend typename MatrixType::storage_index_type getStorageIndex( const MatrixType &A, const size_t i, const size_t j, const size_t s, const size_t P );
 
+				bool getInitialized() const {
+					return static_cast< const DerivedMatrix & >( *this ).getInitialized();
+				}
+
+				void setInitialized( const bool initialized ) {
+					static_cast< DerivedMatrix & >( *this ).setInitialized( initialized );
+
+				}
+
 				template< typename AccessType, typename StorageIndexType >
 				const AccessType access( const StorageIndexType storageIndex ) const {
 					static_assert( std::is_same< AccessType, typename DerivedMatrix::access_type >::value );
@@ -557,13 +562,13 @@ namespace alp {
 					return A.container;
 				}
 
-				// friend bool getInitialized( self_type & A ) noexcept {
-				// 	return getInitialized( getContainer( A ) );
-				// }
+				bool getInitialized() const noexcept {
+					return internal::getInitialized( container );
+				}
 
-				// friend void setInitialized( self_type & A, bool initialized ) noexcept {
-				// 	setInitialized( getContainer( A ), initialized );
-				// }
+				void setInitialized( const bool initialized ) noexcept {
+					internal::setInitialized( container , initialized );
+				}
 
 				/**
 				 * Returns a constant reference to the element corresponding to
@@ -640,12 +645,23 @@ namespace alp {
 				typedef std::pair< size_t, size_t > storage_index_type;
 
 			protected:
+
+				const bool initialized; // Temporary solution, proper implementation pending
+
 				ImfR imf_r;
 				ImfC imf_c;
 
 				typedef std::function< Ret( Args... ) > lambda_function_type;
 				lambda_function_type &lambda;
 
+				bool getInitialized() const noexcept {
+					return initialized;
+				}
+
+				void setInitialized( const bool ) noexcept {
+					static_assert( "Calling setInitialized on a MatrixFunctor is not allowed." );
+				}
+
 				access_type access( const storage_index_type &storage_index ) const {
 					return lambda( imf_r.map( storage_index.first ), imf_c.map( storage_index.second ) );
 				}
@@ -659,11 +675,13 @@ namespace alp {
 			public:
 
 				MatrixFunctor(
+					const bool initialized,
 					lambda_function_type &lambda,
 					ImfR &&imf_r,
 					ImfC &&imf_c
 				) :
 					MatrixBase< MatrixFunctor< T, ImfR, ImfC, Ret, Args... > >( imf_r.N, imf_c.N ),
+					initialized( initialized ),
 					lambda( lambda ) {}
 
 		}; // class MatrixFunctor
@@ -1645,6 +1663,16 @@ namespace alp {
 	/** Definitions of previously declared global methods that operate on ALP Matrix */
 	namespace internal {
 
+		template< typename MatrixType >
+		bool getInitialized( const MatrixType &A ) noexcept {
+			return static_cast< const MatrixBase< typename MatrixType::base_type > >( A ).template getInitialized();
+		}
+
+		template< typename MatrixType >
+		void setInitialized( MatrixType &A, const bool initialized ) noexcept {
+			return static_cast< MatrixBase< typename MatrixType::base_type > >( A ).template setInitialized( initialized );
+		}
+
 		template< typename DerivedMatrix >
 		std::pair< size_t, size_t > dims( const MatrixBase< DerivedMatrix > & A ) noexcept {
 			return A.dims();

include/alp/reference/vector.hpp

@@ -61,7 +61,7 @@ namespace alp {
 		const bool & getInitialized( const Vector< T, reference > & v ) noexcept;
 
 		template< typename T >
-		void setInitialized( Vector< T, reference > & v, bool initialized ) noexcept;
+		void setInitialized( Vector< T, reference > & v, const bool initialized ) noexcept;
 
 
 		/**