From 7665027249f5a81eb9c5cad5d14947c799b5e73e Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 21 Aug 2017 08:42:13 +0200
Subject: [PATCH] base Unary Nullary operations on Nary Operation
---
.../src/abstraction/AlgorithmAbstraction.hpp | 2 +-
.../src/abstraction/CastAbstraction.hpp | 2 +-
.../src/abstraction/DowncastAbstraction.hpp | 2 +-
.../abstraction/NaryOperationAbstraction.hpp | 17 ++---
.../src/abstraction/NormalizeAbstraction.hpp | 2 +-
.../NullaryOperationAbstraction.hpp | 40 +----------
.../abstraction/UnaryOperationAbstraction.hpp | 66 +------------------
.../abstraction/ValueOperationAbstraction.hpp | 29 --------
.../abstraction/ValuePrinterAbstraction.hpp | 2 +-
.../abstraction/XmlFileWriterAbstraction.hpp | 2 +-
10 files changed, 17 insertions(+), 147 deletions(-)
diff --git a/alib2common/src/abstraction/AlgorithmAbstraction.hpp b/alib2common/src/abstraction/AlgorithmAbstraction.hpp
index 2c95d01454..7b6b993bec 100644
--- a/alib2common/src/abstraction/AlgorithmAbstraction.hpp
+++ b/alib2common/src/abstraction/AlgorithmAbstraction.hpp
@@ -30,7 +30,7 @@ public:
if ( this->cached ( ) )
return true;
- this->run_helper ( m_callback, this->inputs, std::make_index_sequence < sizeof ... ( ParamTypes ) > { } );
+ this->run_helper ( m_callback, this->m_params, std::make_index_sequence < sizeof ... ( ParamTypes ) > { } );
return true;
}
diff --git a/alib2common/src/abstraction/CastAbstraction.hpp b/alib2common/src/abstraction/CastAbstraction.hpp
index a92b875d97..5fc7947d9c 100644
--- a/alib2common/src/abstraction/CastAbstraction.hpp
+++ b/alib2common/src/abstraction/CastAbstraction.hpp
@@ -26,7 +26,7 @@ public:
if ( this->cached ( ) )
return true;
- this->m_data = ReturnType ( this->m_param->getConstValueReference ( ) );
+ this->m_data = ReturnType ( std::get < 0 > ( this->m_params )->getConstValueReference ( ) );
return true;
}
diff --git a/alib2common/src/abstraction/DowncastAbstraction.hpp b/alib2common/src/abstraction/DowncastAbstraction.hpp
index 386c7ea22d..91b15da440 100644
--- a/alib2common/src/abstraction/DowncastAbstraction.hpp
+++ b/alib2common/src/abstraction/DowncastAbstraction.hpp
@@ -26,7 +26,7 @@ public:
if ( this->cached ( ) )
return true;
- this->m_data = ConcreteType ( static_cast < const ConcreteType & > ( this->m_param->getConstValueReference ( ) ) );
+ this->m_data = ConcreteType ( static_cast < const ConcreteType & > ( std::get < 0 > ( this->m_params )->getConstValueReference ( ) ) );
return true;
}
diff --git a/alib2common/src/abstraction/NaryOperationAbstraction.hpp b/alib2common/src/abstraction/NaryOperationAbstraction.hpp
index 8da97cccc0..7f3a55f026 100644
--- a/alib2common/src/abstraction/NaryOperationAbstraction.hpp
+++ b/alib2common/src/abstraction/NaryOperationAbstraction.hpp
@@ -18,7 +18,7 @@ namespace abstraction {
template < class ReturnType, class ... ParamTypes >
class NaryOperationAbstraction : public ValueOperationAbstraction < ReturnType > {
protected:
- ext::tuple < std::shared_ptr < ValueProvider < ParamTypes > > ... > inputs;
+ ext::tuple < std::shared_ptr < ValueProvider < ParamTypes > > ... > m_params;
private:
virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > & input, unsigned index ) override {
@@ -34,7 +34,7 @@ private:
return false;
}
};
- return ext::call_on_nth < bool > ( inputs, index, attachCallback );
+ return ext::call_on_nth < bool > ( m_params, index, attachCallback );
}
virtual bool detachInput ( unsigned index ) override {
@@ -42,19 +42,16 @@ private:
param = nullptr;
return true;
};
- return ext::call_on_nth < bool > ( inputs, index, detachCallback );
+ return ext::call_on_nth < bool > ( m_params, index, detachCallback );
}
public:
- NaryOperationAbstraction ( ) {
- }
-
virtual bool inputsReady ( ) const override {
auto readyCallback = [ ] ( const auto & param ) {
return ( bool ) param && param->isReady ( );
};
- return ext::all_of ( inputs, readyCallback );
+ return ext::all_of ( m_params, readyCallback );
}
virtual bool inputsAttached ( ) const override {
@@ -62,7 +59,7 @@ public:
return ( bool ) param;
};
- return ext::all_of ( inputs, attachedCallback );
+ return ext::all_of ( m_params, attachedCallback );
}
virtual bool eval ( ) override {
@@ -76,7 +73,7 @@ public:
return param->eval ( );
};
- if ( ! ext::all_of ( inputs, evalCallback ) )
+ if ( ! ext::all_of ( m_params, evalCallback ) )
return false;
return this->run ( );
@@ -90,7 +87,7 @@ public:
auto callback = [ & ] ( auto & param ) {
return ext::type_index ( typeid ( typename std::decay < decltype ( param ) >::type::element_type::return_type ) );
};
- return ext::call_on_nth < ext::type_index > ( inputs, index, callback );
+ return ext::call_on_nth < ext::type_index > ( m_params, index, callback );
}
};
diff --git a/alib2common/src/abstraction/NormalizeAbstraction.hpp b/alib2common/src/abstraction/NormalizeAbstraction.hpp
index 58caf4295f..ce775fffa4 100644
--- a/alib2common/src/abstraction/NormalizeAbstraction.hpp
+++ b/alib2common/src/abstraction/NormalizeAbstraction.hpp
@@ -26,7 +26,7 @@ public:
if ( this->cached ( ) )
return true;
- this->m_data = ReturnType ( * std::unique_ptr < ReturnType > ( static_cast < ReturnType * > ( std::move ( this->m_param->getValue ( ) ).normalize ( ) ) ) );
+ this->m_data = ReturnType ( * std::unique_ptr < ReturnType > ( static_cast < ReturnType * > ( std::move ( std::get < 0 > ( this->m_params )->getValue ( ) ).normalize ( ) ) ) );
return true;
}
diff --git a/alib2common/src/abstraction/NullaryOperationAbstraction.hpp b/alib2common/src/abstraction/NullaryOperationAbstraction.hpp
index d0a4ec6fb8..8c5df82ee7 100644
--- a/alib2common/src/abstraction/NullaryOperationAbstraction.hpp
+++ b/alib2common/src/abstraction/NullaryOperationAbstraction.hpp
@@ -8,48 +8,12 @@
#ifndef _NULLARY_OPERATION_ABSTRACTION_HPP_
#define _NULLARY_OPERATION_ABSTRACTION_HPP_
-#include <abstraction/ValueOperationAbstraction.hpp>
-#include <exception/CommonException.h>
+#include <abstraction/NaryOperationAbstraction.hpp>
namespace abstraction {
template < class ReturnType >
-class NullaryOperationAbstraction : public ValueOperationAbstraction < ReturnType > {
- virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > &, unsigned ) override {
- return false;
- }
-
- virtual bool detachInput ( unsigned ) override {
- return true;
- }
-
-public:
- NullaryOperationAbstraction ( ) {
- }
-
- virtual bool inputsReady ( ) const override {
- return true;
- }
-
- virtual bool inputsAttached ( ) const override {
- return true;
- }
-
- virtual bool eval ( ) override {
- if ( this->cached ( ) )
- return true;
-
- return this->run ( );
- }
-
- virtual unsigned numberOfParams ( ) const override {
- return 0;
- }
-
- virtual ext::type_index getParamTypeIndex ( unsigned ) const override {
- throw exception::CommonException ( "Nullary algorithm does not have any parameter." );
- }
-
+class NullaryOperationAbstraction : public NaryOperationAbstraction < ReturnType > {
};
} /* namespace abstraction */
diff --git a/alib2common/src/abstraction/UnaryOperationAbstraction.hpp b/alib2common/src/abstraction/UnaryOperationAbstraction.hpp
index bce9dae138..7443e837e8 100644
--- a/alib2common/src/abstraction/UnaryOperationAbstraction.hpp
+++ b/alib2common/src/abstraction/UnaryOperationAbstraction.hpp
@@ -8,74 +8,12 @@
#ifndef _UNARY_OPERATION_ABSTRACTION_HPP_
#define _UNARY_OPERATION_ABSTRACTION_HPP_
-#include <abstraction/ValueOperationAbstraction.hpp>
-#include <tuple>
-#include <abstraction/Registry.h>
+#include <abstraction/NaryOperationAbstraction.hpp>
namespace abstraction {
template < class ReturnType, class ParamType >
-class UnaryOperationAbstraction : public ValueOperationAbstraction < ReturnType > {
-protected:
- std::shared_ptr < ValueProvider < ParamType > > m_param;
-
-private:
- virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > & input, unsigned index ) override {
- if ( index != 0 )
- throw exception::CommonException ( "Out of range index: " + ext::to_string ( index ) + " max: " + ext::to_string ( numberOfParams ( ) ) + "." );
-
- std::shared_ptr < ValueProvider < ParamType > > validData = std::dynamic_pointer_cast < ValueProvider < ParamType > > ( input );
- if ( validData ) {
- m_param = validData;
- return true;
- } else {
- return false;
- }
- }
-
- virtual bool detachInput ( unsigned index ) override {
- if ( index != 0 )
- return false;
-
- m_param = nullptr;
- return true;
- }
-
-public:
- UnaryOperationAbstraction ( ) {
- }
-
- virtual bool inputsReady ( ) const override {
- return m_param && m_param->isReady ( );
- }
-
- virtual bool inputsAttached ( ) const override {
- return ( bool ) m_param;
- }
-
- virtual bool eval ( ) override {
- if ( ! inputsAttached ( ) )
- return false;
-
- if ( this->cached ( ) )
- return true;
-
- this->m_param->eval ( );
-
- return this->run ( );
- }
-
- virtual unsigned numberOfParams ( ) const override {
- return 1;
- }
-
- virtual ext::type_index getParamTypeIndex ( unsigned index ) const override {
- if ( index != 0 )
- throw std::out_of_range ( "Invalid input index" );
-
- return ext::type_index ( typeid ( ParamType ) );
- }
-
+class UnaryOperationAbstraction : public NaryOperationAbstraction < ReturnType, ParamType > {
};
} /* namespace abstraction */
diff --git a/alib2common/src/abstraction/ValueOperationAbstraction.hpp b/alib2common/src/abstraction/ValueOperationAbstraction.hpp
index 89a9d0a113..8e1a605921 100644
--- a/alib2common/src/abstraction/ValueOperationAbstraction.hpp
+++ b/alib2common/src/abstraction/ValueOperationAbstraction.hpp
@@ -108,12 +108,6 @@ public:
m_data = callback ( std::get < Indexes > ( inputs )->getValue ( ) ... );
}
- template < typename Callable, typename T >
- inline void run_helper ( Callable callback, const T & input ) const {
- if ( ! isReady ( ) )
- m_data = callback ( input->getValue ( ) );
- }
-
virtual bool isReady ( ) const override {
return m_data.template is < ReturnType > ( );
}
@@ -154,12 +148,6 @@ public:
m_data = std::reference_wrapper < ReturnType > ( callback ( std::get < Indexes > ( inputs )->getValue ( ) ... ) );
}
- template < typename Callable, typename T >
- inline void run_helper ( Callable callback, const T & input ) const {
- if ( ! isReady ( ) )
- m_data = std::reference_wrapper < ReturnType > ( callback ( input->getValue ( ) ) );
- }
-
virtual bool isReady ( ) const override {
return m_data.template is < std::reference_wrapper < ReturnType > > ( );
}
@@ -196,12 +184,6 @@ public:
m_data = std::reference_wrapper < const ReturnType > ( callback ( std::get < Indexes > ( inputs )->getValue ( ) ... ) );
}
- template < typename Callable, typename T >
- inline void run_helper ( Callable callback, const T & input ) const {
- if ( ! isReady ( ) )
- m_data = std::reference_wrapper < const ReturnType > ( callback ( input->getValue ( ) ) );
- }
-
virtual bool isReady ( ) const override {
return m_data.template is < std::reference_wrapper < const ReturnType > > ( );
}
@@ -242,12 +224,6 @@ public:
m_data = std::unique_ptr < ReturnType > ( callback ( std::get < Indexes > ( inputs )->getValue ( ) ... ) );
}
- template < typename Callable, typename T >
- inline void run_helper ( Callable callback, const T & input ) const {
- if ( ! isReady ( ) )
- m_data = std::unique_ptr < ReturnType > ( callback ( input->getValue ( ) ) );
- }
-
virtual bool isReady ( ) const override {
return m_data != nullptr;
}
@@ -276,11 +252,6 @@ public:
callback ( std::get < Indexes > ( inputs )->getValue ( ) ... );
}
- template < typename Callable, typename T >
- inline void run_helper ( Callable callback, const T & input ) const {
- callback ( input->getValue ( ) );
- }
-
virtual bool isReady ( ) const {
return true;
}
diff --git a/alib2common/src/abstraction/ValuePrinterAbstraction.hpp b/alib2common/src/abstraction/ValuePrinterAbstraction.hpp
index 71318a04e8..83b8c4a169 100644
--- a/alib2common/src/abstraction/ValuePrinterAbstraction.hpp
+++ b/alib2common/src/abstraction/ValuePrinterAbstraction.hpp
@@ -23,7 +23,7 @@ public:
if ( ! this->inputsReady ( ) )
return false;
- std::cout << this->m_param->getConstValueReference ( ) << std::endl;
+ std::cout << std::get < 0 > ( this->m_params )->getConstValueReference ( ) << std::endl;
return true;
}
};
diff --git a/alib2common/src/abstraction/XmlFileWriterAbstraction.hpp b/alib2common/src/abstraction/XmlFileWriterAbstraction.hpp
index 8076918e34..c4283495b8 100644
--- a/alib2common/src/abstraction/XmlFileWriterAbstraction.hpp
+++ b/alib2common/src/abstraction/XmlFileWriterAbstraction.hpp
@@ -25,7 +25,7 @@ public:
if ( ! this->inputsReady ( ) )
return false;
- alib::XmlDataFactory::toFile ( this->m_param->getConstValueReference ( ), m_filename );
+ alib::XmlDataFactory::toFile ( std::get < 0 > ( this->m_params )->getConstValueReference ( ), m_filename );
return true;
}
};
--
GitLab