From 28a33c499b2583fc57579f9f40b3e8a20a041b6e Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 31 Jan 2018 23:00:52 +0100
Subject: [PATCH] more concrete nonlinear variable symbol construction
---
.../src/tree/generate/RandomTreeFactory.cpp | 4 ++--
.../src/alphabet/NonlinearVariableSymbol.h | 21 -------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/alib2algo/src/tree/generate/RandomTreeFactory.cpp b/alib2algo/src/tree/generate/RandomTreeFactory.cpp
index 8e35b43098..4253133530 100644
--- a/alib2algo/src/tree/generate/RandomTreeFactory.cpp
+++ b/alib2algo/src/tree/generate/RandomTreeFactory.cpp
@@ -169,7 +169,7 @@ struct Node {
if ( singleNonlinearVariable )
return ext::tree < common::ranked_symbol < > > ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( DefaultSymbolType ( "A" ) ) ), DefaultRankType ( 0 ) ), { } );
else
- return ext::tree < common::ranked_symbol < > > ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( symbol ) ), DefaultRankType ( 0 ) ), { } );
+ return ext::tree < common::ranked_symbol < > > ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( DefaultSymbolType ( symbol ) ) ), DefaultRankType ( 0 ) ), { } );
} else {
ext::vector < ext::tree < common::ranked_symbol < > > > children;
Node * nextChild = child;
@@ -386,7 +386,7 @@ RankedNonlinearPattern < > RandomRankedNonlinearPatternFactory::generateRankedNo
nonlinearVariables.insert ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( DefaultSymbolType ( "A" ) ) ), DefaultRankType ( 0 ) ) );
else
for ( char i : rankedAlphabet [ 0 ] )
- nonlinearVariables.insert ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( i ) ), DefaultRankType ( 0 ) ) );
+ nonlinearVariables.insert ( common::ranked_symbol < > ( DefaultSymbolType ( alphabet::NonlinearVariableSymbol < > ( DefaultSymbolType ( i ) ) ), DefaultRankType ( 0 ) ) );
common::ranked_symbol < > subtreeWildcard = alphabet::SubtreeWildcardSymbol::instance < common::ranked_symbol < > > ( );
treeRankedAlphabet.insert ( subtreeWildcard );
diff --git a/alib2data/src/alphabet/NonlinearVariableSymbol.h b/alib2data/src/alphabet/NonlinearVariableSymbol.h
index a763a36a71..4f52ffb5c2 100644
--- a/alib2data/src/alphabet/NonlinearVariableSymbol.h
+++ b/alib2data/src/alphabet/NonlinearVariableSymbol.h
@@ -26,17 +26,8 @@ class NonlinearVariableSymbol : public SymbolBase {
SymbolType m_symbol;
public:
- explicit NonlinearVariableSymbol ( int number );
- explicit NonlinearVariableSymbol ( char character );
- explicit NonlinearVariableSymbol ( std::string symbol );
explicit NonlinearVariableSymbol ( SymbolType symbol );
- /**
- * Creates a subtreeWildcard symbol.
- * @param symbol name of the symbol
- */
- explicit NonlinearVariableSymbol ( );
-
virtual SymbolBase * clone ( ) const;
virtual SymbolBase * plunder ( ) &&;
@@ -67,18 +58,6 @@ public:
typedef NonlinearVariableSymbol < > normalized_type;
};
-template < class SymbolType >
-NonlinearVariableSymbol < SymbolType >::NonlinearVariableSymbol ( int number ) : m_symbol ( DefaultSymbolType ( number ) ) {
-}
-
-template < class SymbolType >
-NonlinearVariableSymbol < SymbolType >::NonlinearVariableSymbol ( char character ) : m_symbol ( DefaultSymbolType ( character ) ) {
-}
-
-template < class SymbolType >
-NonlinearVariableSymbol < SymbolType >::NonlinearVariableSymbol ( std::string symbol ) : m_symbol ( DefaultSymbolType ( std::move ( symbol ) ) ) {
-}
-
template < class SymbolType >
NonlinearVariableSymbol < SymbolType >::NonlinearVariableSymbol ( SymbolType symbol ) : m_symbol ( std::move ( symbol ) ) {
}
--
GitLab