Abstraction: make run function private

alib2abstraction/src/abstraction/AlgorithmAbstraction.hpp

@@ -25,12 +25,6 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		this->template run_helper < ParamTypes ... > ( m_callback, this->m_params );
 		return true;
 	}

alib2abstraction/src/abstraction/CastAbstraction.hpp

@@ -16,12 +16,6 @@ template < class ReturnType, class ParamType >
 class CastAbstraction : public UnaryOperationAbstraction < ReturnType, const ParamType & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = ReturnType ( retrieveValue < const ParamType & > ( param.first, param.second ) );

alib2abstraction/src/abstraction/MemberAbstraction.hpp

@@ -26,12 +26,6 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		ext::array < std::pair < std::shared_ptr < OperationAbstraction >, bool >, sizeof ... ( ParamTypes ) + 1 > params = this->m_params;
 		std::shared_ptr < OperationAbstraction > reference = std::make_shared < ReferenceAbstraction < typename std::remove_reference < ObjectType >::type > > ( );

alib2abstraction/src/abstraction/NormalizeAbstraction.hpp

@@ -18,12 +18,6 @@ template < class ReturnType, class ParamType >
 class NormalizeAbstraction : public UnaryOperationAbstraction < ReturnType, ParamType && > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & rawParam = std::get < 0 > ( this->m_params );
 		ParamType && param = retrieveValue < ParamType && > ( rawParam.first, rawParam.second );
 		ReturnType res = factory::NormalizeFactory::normalize ( std::move ( param ) );

alib2abstraction/src/abstraction/OperationAbstraction.hpp

@@ -15,6 +15,9 @@
 namespace abstraction {
 class OperationAbstraction : public std::enable_shared_from_this < OperationAbstraction > {
+protected:
+	virtual bool run ( ) = 0;
+
 public:
 	virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > & input, unsigned index, bool move, bool checkInput ) = 0;
 	virtual bool detachInput ( unsigned index ) = 0;
@@ -24,7 +27,6 @@ public:
 	virtual bool inputsReady ( ) const = 0;
 	virtual bool inputsAttached ( ) const = 0;
-	virtual bool run ( ) = 0;
 	virtual bool eval ( ) = 0;
 	virtual unsigned numberOfParams ( ) const = 0;
 	virtual bool cached ( ) const = 0;

alib2abstraction/src/abstraction/PackingAbstraction.hpp

@@ -83,13 +83,7 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
-		return m_abstractions [ m_resultId ]->run ( );
+		return m_abstractions [ m_resultId ]->eval ( );
 	}
 	virtual bool eval ( ) override {
@@ -99,7 +93,7 @@ public:
 		if ( this->cached ( ) )
 			return true;
-		return m_abstractions [ m_resultId ]->eval ( );
+		return this->run ( );
 	}
 	virtual unsigned numberOfParams ( ) const override {

alib2abstraction/src/abstraction/ReferenceAbstraction.hpp

@@ -16,12 +16,6 @@ template < class Type >
 class ReferenceAbstraction : public UnaryOperationAbstraction < Type *, Type & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = & retrieveValue < Type & > ( param.first, param.second );

alib2abstraction/src/abstraction/SetAbstraction.hpp

@@ -18,12 +18,6 @@ template < class ParamType >
 class SetAbstraction : public AnyaryOperationAbstraction < ext::set < ParamType >, ParamType > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		ext::set < ParamType > theSet;
 		for ( const std::pair < std::shared_ptr < OperationAbstraction >, bool > & param : this->m_params ) {
 			theSet.insert ( abstraction::retrieveValue < ParamType > ( param.first, param.second ) );

alib2abstraction/src/abstraction/ValuePrinterAbstraction.hpp

@@ -22,12 +22,6 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
-		if ( this->cached ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		m_ostream << retrieveValue < const ParamType & > ( param.first, param.second ) << std::endl;
 		return true;

alib2abstraction/src/abstraction/WrapperAbstraction.hpp

@@ -18,7 +18,7 @@ class BaseWrapperAbstraction : public OperationAbstraction {
 protected:
 	std::function < std::shared_ptr < OperationAbstraction > ( ParamTypes ... ) > m_WrapperFinder;
-	std::optional < std::shared_ptr < OperationAbstraction > > m_data;
+	std::shared_ptr < OperationAbstraction > m_abstraction;
 	ext::array < std::pair < std::shared_ptr < OperationAbstraction >, bool >, sizeof ... ( ParamTypes ) > m_params;
 public:
@@ -93,7 +93,7 @@ public:
 	}
 	virtual bool isReady ( ) const override {
-		return ( bool ) m_data && m_data.value ( )->isReady ( );
+		return ( bool ) m_abstraction && m_abstraction->isReady ( );
 	}
 	virtual bool cached ( ) const override {
@@ -106,10 +106,18 @@ public:
 	virtual std::shared_ptr < abstraction::OperationAbstraction > getProxyAbstraction ( ) override {
 		if ( this->isReady ( ) )
-			return this->m_data.value ( )->getProxyAbstraction ( );
+			return this->m_abstraction->getProxyAbstraction ( );
 		else
 			throw std::domain_error ( "Proxy abstraction not avaiable before evaluation." );
 	}
+
+	void attachInputsToAbstraction ( ) {
+		for ( unsigned index = 0; index < sizeof ... ( ParamTypes ); ++ index )
+			if ( ! this->m_abstraction->attachInput ( this->m_params [ index ].first, index, this->m_params [ index ].second, true ) )
+				throw std::invalid_argument ( "Can't connect param " + this->m_abstraction->getParamType ( index ) + " at " + ext::to_string ( index ) + " of wrapped algorithm with result of type " + this->m_params [ index ].first->getReturnType ( ) + "." );
+
+	}
+
 };
 template < class ReturnType, class ... ParamTypes >
@@ -119,17 +127,14 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->m_data )
-			this->m_data = abstraction::apply < ParamTypes ... > ( this->m_WrapperFinder, this->m_params );
-		std::shared_ptr < OperationAbstraction > & abstraction = this->m_data.value ( );
-		if ( abstraction->getReturnTypeIndex ( ) != this->getReturnTypeIndex ( ) )
+		this->m_abstraction = abstraction::apply < ParamTypes ... > ( this->m_WrapperFinder, this->m_params );
+		if ( this->m_abstraction->getReturnTypeIndex ( ) != this->getReturnTypeIndex ( ) )
 			throw std::domain_error ( "Expected and provided types do not match" );
-		for ( unsigned index = 0; index < sizeof ... ( ParamTypes ); ++ index )
-			abstraction->attachInput ( this->m_params [ index ].first, index, this->m_params [ index ].second, true );
-		return abstraction->run ( );
+		this->attachInputsToAbstraction ( );
+		return this->m_abstraction->eval ( );
 	}
 	virtual ext::type_index getReturnTypeIndex ( ) const override {
@@ -152,14 +157,11 @@ public:
 	}
 	virtual bool run ( ) override {
-		if ( ! this->m_data )
-			this->m_data = abstraction::apply < ParamTypes ... > ( this->m_WrapperFinder, this->m_params );
-		std::shared_ptr < OperationAbstraction > & abstraction = this->m_data.value ( );
-		for ( unsigned index = 0; index < sizeof ... ( ParamTypes ); ++ index )
-			abstraction->attachInput ( this->m_params [ index ].first, index, this->m_params [ index ].second, true );
-		return abstraction->run ( );
+		this->m_abstraction = abstraction::apply < ParamTypes ... > ( this->m_WrapperFinder, this->m_params );
+		this->attachInputsToAbstraction ( );
+		return this->m_abstraction->eval ( );
 	}
 	virtual ext::type_index getReturnTypeIndex ( ) const override {
@@ -168,7 +170,7 @@ public:
 	virtual ext::type_index getRuntimeReturnTypeIndex ( ) const override {
 		if ( this->isReady ( ) )
-			return this->m_data.value ( )->getProxyAbstraction ( )->getRuntimeReturnTypeIndex ( );
+			return this->m_abstraction->getProxyAbstraction ( )->getRuntimeReturnTypeIndex ( );
 		else
 			throw std::domain_error ( "Runtime type unknown before evaluation." );
 	}

alib2raw/src/abstraction/RawReaderAbstraction.hpp

@@ -17,9 +17,6 @@ template < class ReturnType >
 class RawReaderAbstraction : public UnaryOperationAbstraction < ReturnType, std::string && > {
 public:
 	virtual bool run ( ) override {
-		if ( this->isReady ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		ReturnType res = factory::RawDataFactory::fromString ( abstraction::retrieveValue < std::string && > ( param.first, param.second ) );
 		this->m_data = std::move ( res );

alib2raw/src/abstraction/RawWriterAbstraction.hpp

@@ -17,9 +17,6 @@ template < class ParamType >
 class RawWriterAbstraction : public UnaryOperationAbstraction < std::string, const ParamType & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = factory::RawDataFactory::toString ( abstraction::retrieveValue < const ParamType & > ( param.first, param.second ) );
 		return true;

alib2str/src/abstraction/StringReaderAbstraction.hpp

@@ -17,9 +17,6 @@ template < class ReturnType >
 class StringReaderAbstraction : public UnaryOperationAbstraction < ReturnType, std::string && > {
 public:
 	virtual bool run ( ) override {
-		if ( this->isReady ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		ReturnType res = factory::StringDataFactory::fromString ( abstraction::retrieveValue < std::string && > ( param.first, param.second ) );
 		this->m_data = std::move ( res );

alib2str/src/abstraction/StringWriterAbstraction.hpp

@@ -17,9 +17,6 @@ template < class ParamType >
 class StringWriterAbstraction : public UnaryOperationAbstraction < std::string, const ParamType & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = factory::StringDataFactory::toString ( abstraction::retrieveValue < const ParamType & > ( param.first, param.second ) );
 		return true;

alib2xml/src/abstraction/XmlComposerAbstraction.hpp

@@ -17,9 +17,6 @@ template < class ParamType >
 class XmlComposerAbstraction : public UnaryOperationAbstraction < ext::deque < sax::Token >, const ParamType & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = factory::XmlDataFactory::toTokens ( abstraction::retrieveValue < const ParamType & > ( param.first, param.second ) );
 		return true;

alib2xml/src/abstraction/XmlParserAbstraction.hpp

@@ -19,9 +19,6 @@ class XmlParserAbstraction : public UnaryOperationAbstraction < ReturnType, ext:
 public:
 	virtual bool run ( ) override {
-		if ( this->isReady ( ) )
-			return true;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		ReturnType res = factory::XmlDataFactory::fromTokens ( abstraction::retrieveValue < ext::deque < sax::Token > && > ( param.first, param.second ) );
 		this->m_data = std::move ( res );

alib2xml/src/abstraction/XmlTokensComposerAbstraction.hpp

@@ -16,9 +16,6 @@ namespace abstraction {
 class XmlTokensComposerAbstraction : public BinaryOperationAbstraction < void, const ext::deque < sax::Token > &, const std::string & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param2 = std::get < 0 > ( this->m_params );
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param1 = std::get < 1 > ( this->m_params );
 		sax::SaxComposeInterface::composeFile ( abstraction::retrieveValue < const std::string & > ( param1.first, param1.second ), abstraction::retrieveValue < const ext::deque < sax::Token > & > ( param2.first, param2.second ) );

alib2xml/src/abstraction/XmlTokensParserAbstraction.hpp

@@ -16,9 +16,6 @@ namespace abstraction {
 class XmlTokensParserAbstraction : public UnaryOperationAbstraction < ext::deque < sax::Token >, const std::string & > {
 public:
 	virtual bool run ( ) override {
-		if ( ! this->inputsReady ( ) )
-			return false;
-
 		std::pair < std::shared_ptr < OperationAbstraction >, bool > & param = std::get < 0 > ( this->m_params );
 		this->m_data = sax::SaxParseInterface::parseFile ( abstraction::retrieveValue < const std::string & > ( param.first, param.second ) );
 		return true;