diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h index a0b9e9b0cb0a62ff505c41ee6de6a8dc07ede021..aa975d2624eb2eb4d82b0cd5e5c8723068fdbd38 100644 --- a/alib2common/src/container/ObjectsDeque.h +++ b/alib2common/src/container/ObjectsDeque.h @@ -69,6 +69,8 @@ public: return res; } + typedef ObjectsDeque < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsDeque < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h index 23ae170fa7ff103513868cfcb387612756a125b8..ea9cdfa6798b16b56bd8b6398f4295a0b668e4ae 100644 --- a/alib2common/src/container/ObjectsList.h +++ b/alib2common/src/container/ObjectsList.h @@ -69,6 +69,8 @@ public: return res; } + typedef ObjectsList < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsList < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h index 2cc501c85f1a64dc858330a1f8a8b9f6946166a0..996cba92cba489735ef769206814f9230530750e 100644 --- a/alib2common/src/container/ObjectsMap.h +++ b/alib2common/src/container/ObjectsMap.h @@ -71,6 +71,8 @@ public: return res; } + typedef ObjectsMap < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsMap < alib::Object, alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h index 60ff385ae3f72be4cfa80ae6a79b941a3884d0d2..5d9c032402ac22602521a2a4dbfc013e76ad1b05 100644 --- a/alib2common/src/container/ObjectsPair.h +++ b/alib2common/src/container/ObjectsPair.h @@ -65,6 +65,8 @@ public: return std::make_pair ( alib::Object ( alib::AnyObject < FirstType > ( std::move ( source.first ) ) ), alib::Object ( alib::AnyObject < SecondType > ( std::move ( source.second ) ) ) ); } + typedef ObjectsPair < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsPair < alib::Object, alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h index f2d7399670c9ed14bf63d45d7989c7b03554b977..e39e4d15ff04346e54cebe77a243ad01f464297e 100644 --- a/alib2common/src/container/ObjectsSet.h +++ b/alib2common/src/container/ObjectsSet.h @@ -69,6 +69,8 @@ public: return res; } + typedef ObjectsSet < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsSet < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h index 114258239eddf99ef26aa9e98e626fa1d14360bc..010f5a7583457f6ee99409ce599561dfa1cd7a20 100644 --- a/alib2common/src/container/ObjectsTree.h +++ b/alib2common/src/container/ObjectsTree.h @@ -70,6 +70,8 @@ public: return std::tree < alib::Object > ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( node.getData ( ) ) ) ), std::move ( children ) ); } + typedef ObjectsTree < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsTree < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsTrie.h b/alib2common/src/container/ObjectsTrie.h index aee90811ac0d44513145ae55fa8fd1ee54e2a177..76cd54c441df6a7bae979c9ae1e9edfe39ea2127 100644 --- a/alib2common/src/container/ObjectsTrie.h +++ b/alib2common/src/container/ObjectsTrie.h @@ -72,6 +72,8 @@ public: return std::trie < alib::Object, alib::Object > ( alib::Object ( alib::AnyObject < ValueType > ( std::move ( node.getData ( ) ) ) ), std::move ( children ) ); } + typedef ObjectsTrie < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsTrie < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h index 5ee06a051c1173c134cd5a36ed5c44c93a970f02..1d0ac34ad7c6ecd9f3cf67a1766e6a61d8151bf0 100644 --- a/alib2common/src/container/ObjectsVector.h +++ b/alib2common/src/container/ObjectsVector.h @@ -69,6 +69,8 @@ public: return res; } + typedef ObjectsVector < > normalized_type; + virtual ObjectBase * normalize ( ) && { return new ObjectsVector < alib::Object > ( normalizeRaw ( std::move ( * this ) ) ); } diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h index 9fac25144f4f7ec65b389ce90399f742fe481dee..c5129f026706b622d2d3585f65116a547f1de4f0 100644 --- a/alib2common/src/exception/CommonException.h +++ b/alib2common/src/exception/CommonException.h @@ -82,6 +82,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CommonException normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/Bool.h b/alib2common/src/primitive/Bool.h index 68c3d0857c9d22285622b4848ef08ab12d3a3689..cf37e57a54ace1014e23af1171e77d64354ca651 100644 --- a/alib2common/src/primitive/Bool.h +++ b/alib2common/src/primitive/Bool.h @@ -69,6 +69,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef Bool normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/Character.h b/alib2common/src/primitive/Character.h index 8d44ae181413636a76c252519501c399ff1df3e0..360e00f1540b47f9c73d4427b9627a711e64865a 100644 --- a/alib2common/src/primitive/Character.h +++ b/alib2common/src/primitive/Character.h @@ -69,6 +69,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef Character normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/Double.h b/alib2common/src/primitive/Double.h index abff90e0592467a29450733d82cc78a1398e0128..5ac0277a7e79d680e7e1ade9fe03df495c6d9a04 100644 --- a/alib2common/src/primitive/Double.h +++ b/alib2common/src/primitive/Double.h @@ -69,6 +69,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef Double normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/Integer.h b/alib2common/src/primitive/Integer.h index bdecb3ce5a7fe5caff298fee7dd64f2b0386a018..84e129b0d028ccbbbb4dcd7d04b562b4f5d08e5e 100644 --- a/alib2common/src/primitive/Integer.h +++ b/alib2common/src/primitive/Integer.h @@ -69,6 +69,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef Integer normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/String.h b/alib2common/src/primitive/String.h index a3624f3d93c265143bd887d766b8fe0ecbecc141..72105acc6ecd58e7ae323db062148b6f23039353 100644 --- a/alib2common/src/primitive/String.h +++ b/alib2common/src/primitive/String.h @@ -70,6 +70,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef String normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/Unsigned.h b/alib2common/src/primitive/Unsigned.h index 3dfe67dd7fb63a2109988081b7ec8b365d78d352..e43b860f14fdf04fc1e3ff4f87349e18fafe4543 100644 --- a/alib2common/src/primitive/Unsigned.h +++ b/alib2common/src/primitive/Unsigned.h @@ -71,6 +71,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef Unsigned normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2common/src/primitive/UnsignedLong.h b/alib2common/src/primitive/UnsignedLong.h index 6ca67cc428652dc099bc442d6afd5da3b55b97f3..d1898b26700aa42bd62549426e3496720d593763 100644 --- a/alib2common/src/primitive/UnsignedLong.h +++ b/alib2common/src/primitive/UnsignedLong.h @@ -69,6 +69,8 @@ public: virtual PrimitiveBase * inc ( ) &&; + typedef UnsignedLong normalized_type; + virtual ObjectBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/BarSymbol.h b/alib2data/src/alphabet/BarSymbol.h index cc8dd94291ea1c416ccebbf48a7c3a6a348d7b26..ede71a4c7dc1f6d000fd92dc1af81bfea7a31ba8 100644 --- a/alib2data/src/alphabet/BarSymbol.h +++ b/alib2data/src/alphabet/BarSymbol.h @@ -57,6 +57,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef BarSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/BlankSymbol.h b/alib2data/src/alphabet/BlankSymbol.h index 5da1f16cef9543173309fe30f8bd3666b28619c6..a33ac7bbadb27e65d12cdd1b4458afe33d85fd2f 100644 --- a/alib2data/src/alphabet/BlankSymbol.h +++ b/alib2data/src/alphabet/BlankSymbol.h @@ -57,6 +57,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef BlankSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.h b/alib2data/src/alphabet/BottomOfTheStackSymbol.h index 2846eb61ce34b8c6403bc66be623e06a8588d717..b5a29cfcfd99e41fab5787bdffbd86dcef7bec87 100644 --- a/alib2data/src/alphabet/BottomOfTheStackSymbol.h +++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.h @@ -57,6 +57,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef BottomOfTheStackSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/EndSymbol.h b/alib2data/src/alphabet/EndSymbol.h index b2d4968ab0e71e3e900809b2cec6f77fc0569540..df6dd24bcdcf641216e9d39195eeeb85c16d84f9 100644 --- a/alib2data/src/alphabet/EndSymbol.h +++ b/alib2data/src/alphabet/EndSymbol.h @@ -57,6 +57,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef EndSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/InitialSymbol.h b/alib2data/src/alphabet/InitialSymbol.h index 937d4be94f4106e86b7f6873ae067f545deb0a29..ecaadf82b96f0f2f117a70d0ac7a557db39cc1c7 100644 --- a/alib2data/src/alphabet/InitialSymbol.h +++ b/alib2data/src/alphabet/InitialSymbol.h @@ -58,6 +58,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef InitialSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/LabeledSymbol.h b/alib2data/src/alphabet/LabeledSymbol.h index 11dbad4b0388287c9dfd3b18481f83c4d3bc65aa..8b42c47f4d2ba02284480aba02153fe273d5e4ed 100644 --- a/alib2data/src/alphabet/LabeledSymbol.h +++ b/alib2data/src/alphabet/LabeledSymbol.h @@ -65,6 +65,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef LabeledSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/NonlinearVariableSymbol.h b/alib2data/src/alphabet/NonlinearVariableSymbol.h index 1014187840182ca891f83a733e1f1776926c6641..2f1b4862e76821136b9a6125adb15cfa93790d05 100644 --- a/alib2data/src/alphabet/NonlinearVariableSymbol.h +++ b/alib2data/src/alphabet/NonlinearVariableSymbol.h @@ -74,6 +74,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef NonlinearVariableSymbol < > normalized_type; + virtual SymbolBase * normalize ( ) && { if ( typeid ( NonlinearVariableSymbol < > ) == typeid ( NonlinearVariableSymbol < SymbolType > ) ) return this; diff --git a/alib2data/src/alphabet/RankedSymbol.h b/alib2data/src/alphabet/RankedSymbol.h index 8adaf52eb33d7b66740061cfe1c166496e1a6871..13d705792a4055e01a40c11a6b241034c4724309 100644 --- a/alib2data/src/alphabet/RankedSymbol.h +++ b/alib2data/src/alphabet/RankedSymbol.h @@ -70,6 +70,8 @@ public: return std::ranked_symbol < DefaultSymbolType, DefaultRankType > ( SymbolNormalize::normalizeSymbol ( std::move ( source.getSymbol ( ) ) ), DefaultRankType ( std::move ( source.getRank ( ) ) ) ); } + typedef RankedSymbol < > normalized_type; + virtual SymbolBase * normalize ( ) && { if ( typeid ( RankedSymbol < > ) == typeid ( RankedSymbol < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/alphabet/StartSymbol.h b/alib2data/src/alphabet/StartSymbol.h index 44a830518e5d2e93dc4ee4bcc5f878a2475f1608..2f3a58d9b7a238adb1cb8788a8a787668a36f42b 100644 --- a/alib2data/src/alphabet/StartSymbol.h +++ b/alib2data/src/alphabet/StartSymbol.h @@ -57,6 +57,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef StartSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/SubtreeWildcardSymbol.h b/alib2data/src/alphabet/SubtreeWildcardSymbol.h index b7067cbeec3cf4ffffdd2ce316ff436f5957d3cd..6028ba785879cd21f5cebe63fb8c9de3f25a90d4 100644 --- a/alib2data/src/alphabet/SubtreeWildcardSymbol.h +++ b/alib2data/src/alphabet/SubtreeWildcardSymbol.h @@ -58,6 +58,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef SubtreeWildcardSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/UniqueSymbol.h b/alib2data/src/alphabet/UniqueSymbol.h index 7570222bfe3e0d197381b5bfd696d620df08f1b7..2f05e774e6f58958b7ff5ce142a829f58c4a8efd 100644 --- a/alib2data/src/alphabet/UniqueSymbol.h +++ b/alib2data/src/alphabet/UniqueSymbol.h @@ -65,6 +65,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef UniqueSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/alphabet/VariablesBarSymbol.h b/alib2data/src/alphabet/VariablesBarSymbol.h index a2f530cd84bdea11afbe20dd8e856426d7f06006..fdeab2fc247165e506a274a4de91dc672239c279 100644 --- a/alib2data/src/alphabet/VariablesBarSymbol.h +++ b/alib2data/src/alphabet/VariablesBarSymbol.h @@ -58,6 +58,8 @@ public: virtual SymbolBase * inc ( ) &&; + typedef VariablesBarSymbol normalized_type; + virtual SymbolBase * normalize ( ) && { return this; } diff --git a/alib2data/src/automaton/FSM/CompactNFA.h b/alib2data/src/automaton/FSM/CompactNFA.h index 96a07c0b4f5b09361972f3987089afae7b2e1adf..be785336336a96242986d9785ec6a905ded2c74e 100644 --- a/alib2data/src/automaton/FSM/CompactNFA.h +++ b/alib2data/src/automaton/FSM/CompactNFA.h @@ -183,6 +183,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CompactNFA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( CompactNFA < > ) == typeid ( CompactNFA < SymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/FSM/DFA.h b/alib2data/src/automaton/FSM/DFA.h index 56deefbe42a278997e3a0c436c427d8ef40c3a1b..30d98ba0f7dd929cd193a4c59140c83fc35a68c2 100644 --- a/alib2data/src/automaton/FSM/DFA.h +++ b/alib2data/src/automaton/FSM/DFA.h @@ -175,6 +175,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef DFA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( DFA < > ) == typeid ( DFA < SymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.h b/alib2data/src/automaton/FSM/EpsilonNFA.h index 7d4f210ab7d82b4fa23264ee3bd40c72cbe756c0..175870473d19927ebd5dde8e293e573eebba5ca2 100644 --- a/alib2data/src/automaton/FSM/EpsilonNFA.h +++ b/alib2data/src/automaton/FSM/EpsilonNFA.h @@ -276,6 +276,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef EpsilonNFA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( EpsilonNFA < > ) == typeid ( EpsilonNFA < SymbolType, EpsilonType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.h b/alib2data/src/automaton/FSM/ExtendedNFA.h index ad51588e94f0b81f2e8ff9584da4ee9e2692936c..817913247b0365f10cb3d5a1fa40ef8225a5846c 100644 --- a/alib2data/src/automaton/FSM/ExtendedNFA.h +++ b/alib2data/src/automaton/FSM/ExtendedNFA.h @@ -187,6 +187,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef ExtendedNFA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( ExtendedNFA < > ) == typeid ( ExtendedNFA < SymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h index ba75d0c412180a3252f50a293f56fe1c5e261608..84e592b9007109448e6ac2f349425bebe1819a4b 100644 --- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h +++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h @@ -201,6 +201,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef MultiInitialStateNFA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( MultiInitialStateNFA < > ) == typeid ( MultiInitialStateNFA < SymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/DPDA.h b/alib2data/src/automaton/PDA/DPDA.h index ab99f5dab605d58b43df80b8e48037cc5375dca5..e3b00fe957518d728f40cf4afab00e37e061d60b 100644 --- a/alib2data/src/automaton/PDA/DPDA.h +++ b/alib2data/src/automaton/PDA/DPDA.h @@ -208,6 +208,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef DPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( DPDA < > ) == typeid ( DPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.h b/alib2data/src/automaton/PDA/InputDrivenDPDA.h index 979e7ad6f3cd7e226e2591970d574bc92e5166d4..967fd87b1772a42b2c203a49f53be62334b0e0ea 100644 --- a/alib2data/src/automaton/PDA/InputDrivenDPDA.h +++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.h @@ -212,6 +212,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef InputDrivenDPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( InputDrivenDPDA < > ) == typeid ( InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.h b/alib2data/src/automaton/PDA/InputDrivenNPDA.h index f916b2c964dd58420f3d1c9d078bd62e882765f5..0dfad138784d5a63585b8d00c9504970a1e6f9a5 100644 --- a/alib2data/src/automaton/PDA/InputDrivenNPDA.h +++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.h @@ -221,6 +221,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef InputDrivenNPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( InputDrivenNPDA < > ) == typeid ( InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/NPDA.h b/alib2data/src/automaton/PDA/NPDA.h index 9a6dad36d6f619ec8420fc74a427eb1a82a7d0ca..ce4e2b56dadcf10d7b26948c6fd976309da07395 100644 --- a/alib2data/src/automaton/PDA/NPDA.h +++ b/alib2data/src/automaton/PDA/NPDA.h @@ -206,6 +206,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef NPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( NPDA < > ) == typeid ( NPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/NPDTA.h b/alib2data/src/automaton/PDA/NPDTA.h index e84338d4341226b906eba5432f4189732616c7a3..cebb961b30d738059036ee5788041b8a3ddb0a3a 100644 --- a/alib2data/src/automaton/PDA/NPDTA.h +++ b/alib2data/src/automaton/PDA/NPDTA.h @@ -230,6 +230,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef NPDTA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( NPDTA < > ) == typeid ( NPDTA < InputSymbolType, OutputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h index b7e521310ad307000f9f5db6bb0c6d4e214db178..2d74ff778fe8685de39ede285f23ab580b25b139 100644 --- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h +++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h @@ -234,6 +234,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RealTimeHeightDeterministicDPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( RealTimeHeightDeterministicDPDA < > ) == typeid ( RealTimeHeightDeterministicDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h index 0718f3ea9a13dbd4fe1b6a0c0a8fb8ba4b62e8cd..e9387a8fe4a9bed45350286a27ddd680c30c6557 100644 --- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h +++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h @@ -275,6 +275,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RealTimeHeightDeterministicNPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( RealTimeHeightDeterministicNPDA < > ) == typeid ( RealTimeHeightDeterministicNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.h b/alib2data/src/automaton/PDA/SinglePopDPDA.h index 0a6d722ae1b7ab1501e299a2b4d9007dd592d95a..50712c81f1e46d2bd27764af49d5b4112fbcf847 100644 --- a/alib2data/src/automaton/PDA/SinglePopDPDA.h +++ b/alib2data/src/automaton/PDA/SinglePopDPDA.h @@ -199,6 +199,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef SinglePopDPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( SinglePopDPDA < > ) == typeid ( SinglePopDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.h b/alib2data/src/automaton/PDA/SinglePopNPDA.h index f134968944a43dbff1c7677fc36a775f69984d78..542e1d1fac52c98e414d83ee45fe150fec16018f 100644 --- a/alib2data/src/automaton/PDA/SinglePopNPDA.h +++ b/alib2data/src/automaton/PDA/SinglePopNPDA.h @@ -206,6 +206,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef SinglePopNPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( SinglePopNPDA < > ) == typeid ( SinglePopNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h index be2305b4cbf65e7e72140ea1c2d00d50c2477a3a..fd4419f50689b895d58cebe6c9898167e28e316a 100644 --- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h +++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h @@ -267,6 +267,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef VisiblyPushdownDPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( VisiblyPushdownDPDA < > ) == typeid ( VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h index 6cb1e71de43d87b4fe21d432d03ed63372c33320..a1e20129cca0d2341fda8720c45740ea8c16d5ea 100644 --- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h +++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h @@ -302,6 +302,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef VisiblyPushdownNPDA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( VisiblyPushdownNPDA < > ) == typeid ( VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/TA/DFTA.h b/alib2data/src/automaton/TA/DFTA.h index 6efe2375b951494eb3ebf83ca8616299b1d6a54b..e12e18528586f8e6739dc01e9fd486c5e547e430 100644 --- a/alib2data/src/automaton/TA/DFTA.h +++ b/alib2data/src/automaton/TA/DFTA.h @@ -150,6 +150,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef DFTA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( DFTA < > ) == typeid ( DFTA < SymbolType, RankType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/TA/NFTA.h b/alib2data/src/automaton/TA/NFTA.h index 53129b580460ec686d45d0e140e544629b0da153..140c906ebdf3b5a045c5a2791f501b46c38563ad 100644 --- a/alib2data/src/automaton/TA/NFTA.h +++ b/alib2data/src/automaton/TA/NFTA.h @@ -168,6 +168,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef NFTA < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( NFTA < > ) == typeid ( NFTA < SymbolType, RankType, StateType > ) ) return this; diff --git a/alib2data/src/automaton/TM/OneTapeDTM.h b/alib2data/src/automaton/TM/OneTapeDTM.h index dbd2d5b774d7b8d95823e925e6f11dd96efc4f0b..6ae52378c325135f6f641069565b740f12739ff2 100644 --- a/alib2data/src/automaton/TM/OneTapeDTM.h +++ b/alib2data/src/automaton/TM/OneTapeDTM.h @@ -187,6 +187,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef OneTapeDTM < > normalized_type; + virtual AutomatonBase * normalize ( ) && { if ( typeid ( OneTapeDTM < > ) == typeid ( OneTapeDTM < SymbolType, StateType > ) ) return this; diff --git a/alib2data/src/grammar/ContextFree/CFG.h b/alib2data/src/grammar/ContextFree/CFG.h index 319df67569efe04b766edfcf9e01207fb21e55d9..a88a3328849aaa95ada931bdc1a39579594b9b75 100644 --- a/alib2data/src/grammar/ContextFree/CFG.h +++ b/alib2data/src/grammar/ContextFree/CFG.h @@ -121,6 +121,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CFG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( CFG < > ) == typeid ( CFG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextFree/CNF.h b/alib2data/src/grammar/ContextFree/CNF.h index 99dec2db973bab63621dda8787fd7c17be9c4e0f..49a41faf96da91d646e50e7fbf5b9a85913223ba 100644 --- a/alib2data/src/grammar/ContextFree/CNF.h +++ b/alib2data/src/grammar/ContextFree/CNF.h @@ -128,6 +128,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CNF < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( CNF < > ) == typeid ( CNF < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h index 7f48583bf1e4cc40b02f63e5e45710609cbce851..b2a84a3b5a69bbf70a5b8ac3e46b329dcae80a54 100644 --- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h +++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h @@ -123,6 +123,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef EpsilonFreeCFG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( EpsilonFreeCFG < > ) == typeid ( EpsilonFreeCFG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextFree/GNF.h b/alib2data/src/grammar/ContextFree/GNF.h index a7d85cc85c63c18fa803ff03f2234227ed8edc33..600c49838bfeaf31cea09bc99a64c0531f541f99 100644 --- a/alib2data/src/grammar/ContextFree/GNF.h +++ b/alib2data/src/grammar/ContextFree/GNF.h @@ -124,6 +124,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef GNF < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( GNF < > ) == typeid ( GNF < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextFree/LG.h b/alib2data/src/grammar/ContextFree/LG.h index b45d22cc70735b0a9789f407390fae2e0b520b49..fd1276193fba423758a8a7c99b273b2e037ad664 100644 --- a/alib2data/src/grammar/ContextFree/LG.h +++ b/alib2data/src/grammar/ContextFree/LG.h @@ -125,6 +125,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef LG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( LG < > ) == typeid ( LG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextSensitive/CSG.h b/alib2data/src/grammar/ContextSensitive/CSG.h index 60798f44cb8ba19409b58943b41b16525755eb7e..32da801afe4499548103b357b2ad7289e6cf492a 100644 --- a/alib2data/src/grammar/ContextSensitive/CSG.h +++ b/alib2data/src/grammar/ContextSensitive/CSG.h @@ -117,6 +117,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CSG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( CSG < > ) == typeid ( CSG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h index c46365433fb1dac30016b83c65ecaa309a64287b..8d427d27b0347dc960790af29bcd1c541f2466c0 100644 --- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h +++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h @@ -117,6 +117,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef NonContractingGrammar < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( NonContractingGrammar < > ) == typeid ( NonContractingGrammar < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Regular/LeftLG.h b/alib2data/src/grammar/Regular/LeftLG.h index accb91d52ba377a27fec22937eebb480139a99b0..9c172ab9f555e8823deafada5d35e60ac14406f6 100644 --- a/alib2data/src/grammar/Regular/LeftLG.h +++ b/alib2data/src/grammar/Regular/LeftLG.h @@ -124,6 +124,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef LeftLG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( LeftLG < > ) == typeid ( LeftLG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Regular/LeftRG.h b/alib2data/src/grammar/Regular/LeftRG.h index 9808617bf71fedee9566c9e28ad77519fbeaca97..703748a43fa0f36564bc00338ed3673efba1e848 100644 --- a/alib2data/src/grammar/Regular/LeftRG.h +++ b/alib2data/src/grammar/Regular/LeftRG.h @@ -205,6 +205,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef LeftRG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( LeftRG < > ) == typeid ( LeftRG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Regular/RightLG.h b/alib2data/src/grammar/Regular/RightLG.h index 0daa2873f5ce68e669d4e17248bda3f5608cb687..3abb6f142261a062f9f4b0befe5d69cae8d84baa 100644 --- a/alib2data/src/grammar/Regular/RightLG.h +++ b/alib2data/src/grammar/Regular/RightLG.h @@ -124,6 +124,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RightLG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( RightLG < > ) == typeid ( RightLG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Regular/RightRG.h b/alib2data/src/grammar/Regular/RightRG.h index c7fbce6e9f7abbf8af2d13e702ee7601aab6fa79..dd4b38b24d09561c3626b9d7cc3ded72484165e8 100644 --- a/alib2data/src/grammar/Regular/RightRG.h +++ b/alib2data/src/grammar/Regular/RightRG.h @@ -145,6 +145,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RightRG < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( RightRG < > ) == typeid ( RightRG < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h index deccf917d8f09098d6a3bf17d0f377be8057e508..e40e9084104e1430ddf98d708427386d34db796d 100644 --- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h +++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h @@ -113,6 +113,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef ContextPreservingUnrestrictedGrammar < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( ContextPreservingUnrestrictedGrammar < > ) == typeid ( ContextPreservingUnrestrictedGrammar < SymbolType > ) ) return this; diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h index 8ec51e336fd3a69b6f332e91367f7521001f2bee..663a633261ec2ca7bc49248fa9117ee5e437475d 100644 --- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h +++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h @@ -113,6 +113,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef UnrestrictedGrammar < > normalized_type; + virtual GrammarBase * normalize ( ) && { if ( typeid ( UnrestrictedGrammar < > ) == typeid ( UnrestrictedGrammar < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h b/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h index 2ada29763ec11c63566e56fc15c7436dd64a368f..efa53cb6b30119f9cdf0bb1abdf0273f4adfcafa 100644 --- a/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h +++ b/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h @@ -119,6 +119,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CompressedBitParallelTreeIndex < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( CompressedBitParallelTreeIndex < > ) == typeid ( CompressedBitParallelTreeIndex < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/arbology/FullAndLinearIndex.h b/alib2data/src/indexes/arbology/FullAndLinearIndex.h index ffb7fdd283d8f18fc9a676f0efb40b3f6df04781..80bae62846e68574d349dbca31f943e008acba29 100644 --- a/alib2data/src/indexes/arbology/FullAndLinearIndex.h +++ b/alib2data/src/indexes/arbology/FullAndLinearIndex.h @@ -114,6 +114,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef FullAndLinearIndex < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( FullAndLinearIndex < > ) == typeid ( FullAndLinearIndex < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/arbology/NonlinearFullAndLinearIndex.h b/alib2data/src/indexes/arbology/NonlinearFullAndLinearIndex.h index 9629fe3d4fec045dfdf09695ff3eb32936e9758f..5d7c602203a594c5ab0f78e6fdb917b9af71d07a 100644 --- a/alib2data/src/indexes/arbology/NonlinearFullAndLinearIndex.h +++ b/alib2data/src/indexes/arbology/NonlinearFullAndLinearIndex.h @@ -120,6 +120,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef NonlinearFullAndLinearIndex < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( NonlinearFullAndLinearIndex < > ) == typeid ( NonlinearFullAndLinearIndex < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/stringology/BNDMMatcher.h b/alib2data/src/indexes/stringology/BNDMMatcher.h index ea82fa48a5b67078cdd4460243896382ec8f3bb3..e52f141b3e6624348fe78f697c15e79de288365a 100644 --- a/alib2data/src/indexes/stringology/BNDMMatcher.h +++ b/alib2data/src/indexes/stringology/BNDMMatcher.h @@ -115,6 +115,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef BNDMMatcher < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( BNDMMatcher < > ) == typeid ( BNDMMatcher < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/stringology/BitParallelIndex.h b/alib2data/src/indexes/stringology/BitParallelIndex.h index bb6e5074568533fd5053e98e72fc0a9f71b985ac..8c685e742943614190ffb83311bc60e608934f6e 100644 --- a/alib2data/src/indexes/stringology/BitParallelIndex.h +++ b/alib2data/src/indexes/stringology/BitParallelIndex.h @@ -112,6 +112,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef BitParallelIndex < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( BitParallelIndex < > ) == typeid ( BitParallelIndex < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h b/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h index 53bd95dd1317540e1863d7426fd56e636e6ece1e..8cb1558c9ccb27c5988c51ecd58ff35f50ade67c 100644 --- a/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h +++ b/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h @@ -112,6 +112,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CompressedBitParallelIndex < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( CompressedBitParallelIndex < > ) == typeid ( CompressedBitParallelIndex < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/stringology/PositionHeap.h b/alib2data/src/indexes/stringology/PositionHeap.h index 5e76e2b0178144a6f8acaf33a9cfa4aba6637caf..8ed2b108ccbceb6b98c4903009957cb03690cb00 100644 --- a/alib2data/src/indexes/stringology/PositionHeap.h +++ b/alib2data/src/indexes/stringology/PositionHeap.h @@ -122,6 +122,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PositionHeap < > normalized_type; + PositionHeap < > normalizeRaw ( ) && { std::set < DefaultSymbolType > alphabet = alphabet::SymbolNormalize::normalizeAlphabet ( std::move ( this->template accessComponent < GeneralAlphabet > ( ).get ( ) ) ); std::trie < DefaultSymbolType, unsigned > trie = IndexesNormalize::normalizeTrie ( std::move ( m_trie ) ); diff --git a/alib2data/src/indexes/stringology/SuffixArray.h b/alib2data/src/indexes/stringology/SuffixArray.h index 1ba1070828d544c4a072a6fe83723cef3055764e..a92835b31f0a2cbfe5ad498440df3f807049acda 100644 --- a/alib2data/src/indexes/stringology/SuffixArray.h +++ b/alib2data/src/indexes/stringology/SuffixArray.h @@ -116,6 +116,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef SuffixArray < > normalized_type; + virtual ObjectBase * normalize ( ) && { if ( typeid ( SuffixArray < > ) == typeid ( SuffixArray < SymbolType > ) ) return this; diff --git a/alib2data/src/indexes/stringology/SuffixTrie.h b/alib2data/src/indexes/stringology/SuffixTrie.h index cbca5fb2d91b64986610b50846641704613decc2..2b90c908c501d29a40dcacca9a3eeabee302aa84 100644 --- a/alib2data/src/indexes/stringology/SuffixTrie.h +++ b/alib2data/src/indexes/stringology/SuffixTrie.h @@ -122,6 +122,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef SuffixTrie < > normalized_type; + virtual alib::ObjectBase * normalize ( ) && { if ( typeid ( SuffixTrie < > ) == typeid ( SuffixTrie < SymbolType > ) ) return this; diff --git a/alib2data/src/label/FailStateLabel.h b/alib2data/src/label/FailStateLabel.h index 373acf25581b57e911fdd023586c9ff2751ca931..c63a9677860ca580d993662bb1e006c307baf337 100644 --- a/alib2data/src/label/FailStateLabel.h +++ b/alib2data/src/label/FailStateLabel.h @@ -58,6 +58,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef FailStateLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/FinalStateLabel.h b/alib2data/src/label/FinalStateLabel.h index cbb28884dc7e27e56dedc8696b9cdaf694eb9153..f24ccb0dc110cc73723a2f7525e3bf53c48c22a6 100644 --- a/alib2data/src/label/FinalStateLabel.h +++ b/alib2data/src/label/FinalStateLabel.h @@ -58,6 +58,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef FinalStateLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/HexavigesimalLabel.h b/alib2data/src/label/HexavigesimalLabel.h index 6769d33d84218c7b4a848d7e058ac4f8b4c01e5c..e1e6cea3574d0c8b0f960b91d98b2fb6729c8a9c 100644 --- a/alib2data/src/label/HexavigesimalLabel.h +++ b/alib2data/src/label/HexavigesimalLabel.h @@ -63,6 +63,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef HexavigesimalLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/InitialStateLabel.h b/alib2data/src/label/InitialStateLabel.h index 7fdee2b76275fdbe8795b73e5b59e538392c8a49..7f1d1a53ea95463dc480d8497b58edabc26c4400 100644 --- a/alib2data/src/label/InitialStateLabel.h +++ b/alib2data/src/label/InitialStateLabel.h @@ -58,6 +58,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef InitialStateLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/ObjectLabel.h b/alib2data/src/label/ObjectLabel.h index 1d05c31597c097a54c60238cea04b0fd46609f50..a066dda2a3561da8597ba81b80eef45c29afd022 100644 --- a/alib2data/src/label/ObjectLabel.h +++ b/alib2data/src/label/ObjectLabel.h @@ -61,6 +61,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef ObjectLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/PrimitiveLabel.h b/alib2data/src/label/PrimitiveLabel.h index 7661b8a8fa7e931117921b5a3d82a206977b67ed..e37b6adce0dd79002a6c2842e509419da9f9390e 100644 --- a/alib2data/src/label/PrimitiveLabel.h +++ b/alib2data/src/label/PrimitiveLabel.h @@ -63,6 +63,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef PrimitiveLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/label/UniqueLabel.h b/alib2data/src/label/UniqueLabel.h index eb719ee38d91b8d4c3d714b0c24a4f9ec0c98892..f9ca252391f248edb706cc408b3839866f11c942 100644 --- a/alib2data/src/label/UniqueLabel.h +++ b/alib2data/src/label/UniqueLabel.h @@ -65,6 +65,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef UniqueLabel normalized_type; + virtual LabelBase * normalize ( ) && { return this; } diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h index 22652937fe941d8c5f26ddc81629be7f9286f6ca..819ff33e71ed8bb4b7d14656c58b86c67effcf60 100644 --- a/alib2data/src/regexp/formal/FormalRegExp.h +++ b/alib2data/src/regexp/formal/FormalRegExp.h @@ -105,6 +105,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef FormalRegExp < > normalized_type; + virtual RegExpBase * normalize ( ) && { if ( typeid ( FormalRegExp < > ) == typeid ( FormalRegExp < SymbolType > ) ) return this; diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h index 9b7d00665296564a65108d442480e2f95ef44da1..413fd5056fab2fd01f35451884de9c97644d9f5c 100644 --- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h +++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h @@ -105,6 +105,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef UnboundedRegExp < > normalized_type; + virtual RegExpBase * normalize ( ) && { if ( typeid ( UnboundedRegExp < > ) == typeid ( UnboundedRegExp < SymbolType > ) ) return this; diff --git a/alib2data/src/rte/formal/FormalRTE.h b/alib2data/src/rte/formal/FormalRTE.h index 6425a592cf11810e21d6f93adf55f436131869f1..2740770e35bcf2af55ae87bb03c7a2423af46f1f 100644 --- a/alib2data/src/rte/formal/FormalRTE.h +++ b/alib2data/src/rte/formal/FormalRTE.h @@ -142,6 +142,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef FormalRTE < > normalized_type; + virtual RTEBase * normalize ( ) && { if ( typeid ( FormalRTE < > ) == typeid ( FormalRTE < SymbolType > ) ) return this; diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h index 22dbd83350fd1d70b73ac45cb293387a190f752f..ec2ac04cb55e50ff6e278d52096683180dec6e96 100644 --- a/alib2data/src/string/CyclicString.h +++ b/alib2data/src/string/CyclicString.h @@ -91,6 +91,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef CyclicString < > normalized_type; + virtual StringBase * normalize ( ) && { if ( typeid ( CyclicString < > ) == typeid ( CyclicString < SymbolType > ) ) return this; diff --git a/alib2data/src/string/Epsilon.h b/alib2data/src/string/Epsilon.h index 77cfeef8d77842600f6b28a42590fd81569c5bda..3a99330be83b20aceddad54d4a76c2eb613de930 100644 --- a/alib2data/src/string/Epsilon.h +++ b/alib2data/src/string/Epsilon.h @@ -85,6 +85,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef Epsilon < > normalized_type; + virtual StringBase * normalize ( ) && { if ( typeid ( Epsilon < > ) == typeid ( Epsilon < SymbolType > ) ) return this; diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h index 6941131e9ee63547c9ae7ef0c65a5a769a655c0a..79e77d2ad31527420952479866d3157ed9a5e11b 100644 --- a/alib2data/src/string/LinearString.h +++ b/alib2data/src/string/LinearString.h @@ -111,6 +111,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef LinearString < > normalized_type; + virtual StringBase * normalize ( ) && { if ( typeid ( LinearString < > ) == typeid ( LinearString < SymbolType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PostfixRankedTree.h b/alib2data/src/tree/ranked/PostfixRankedTree.h index 0ba7867d4c7ae2b18dd3433be40873366e57dfcc..65fc6061942ab749cd7a37ace62666a568eab047 100644 --- a/alib2data/src/tree/ranked/PostfixRankedTree.h +++ b/alib2data/src/tree/ranked/PostfixRankedTree.h @@ -95,6 +95,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PostfixRankedTree < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PostfixRankedTree < > ) == typeid ( PostfixRankedTree < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.h b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.h index 63cc98e7a1dd3cbee806d497b160567c878166ad..0abdfa9d587c5b678a86cd09401651012d91fc05 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.h +++ b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.h @@ -128,6 +128,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedBarNonlinearPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedBarNonlinearPattern < > ) == typeid ( PrefixRankedBarNonlinearPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedBarPattern.h b/alib2data/src/tree/ranked/PrefixRankedBarPattern.h index ef9cdf1fb3546842b6a502d9afa40cb9336121e5..7355ca9eecdb202badc5c899a1ec1cd5f25a2931 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarPattern.h +++ b/alib2data/src/tree/ranked/PrefixRankedBarPattern.h @@ -117,6 +117,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedBarPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedBarPattern < > ) == typeid ( PrefixRankedBarPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedBarTree.h b/alib2data/src/tree/ranked/PrefixRankedBarTree.h index a85b7bccb9f92681ea63156e7a630c989c46161f..fe77219140523c296ec1fa1534de5dbb4efb60d8 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarTree.h +++ b/alib2data/src/tree/ranked/PrefixRankedBarTree.h @@ -104,6 +104,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedBarTree < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedBarTree < > ) == typeid ( PrefixRankedBarTree < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h index d6a08ae232237836b4a0b45bfd985fb5abbf8d66..22776aee4f25a5249a15ad8b624b8aad75d7ff14 100644 --- a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h +++ b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h @@ -112,6 +112,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedNonlinearPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedNonlinearPattern < > ) == typeid ( PrefixRankedNonlinearPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.h b/alib2data/src/tree/ranked/PrefixRankedPattern.h index 57d3f06fb49f727e62362c6591199db7d8a3cb58..1833974c4ceb072939e821cb3df0e9246b94567d 100644 --- a/alib2data/src/tree/ranked/PrefixRankedPattern.h +++ b/alib2data/src/tree/ranked/PrefixRankedPattern.h @@ -103,6 +103,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedPattern < > ) == typeid ( PrefixRankedPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.h b/alib2data/src/tree/ranked/PrefixRankedTree.h index fb766abb055cb4304158a63f9a70da5311a1863a..17bc696eade1f3827a377b7d8b9d875f64883749 100644 --- a/alib2data/src/tree/ranked/PrefixRankedTree.h +++ b/alib2data/src/tree/ranked/PrefixRankedTree.h @@ -95,6 +95,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixRankedTree < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( PrefixRankedTree < > ) == typeid ( PrefixRankedTree < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/RankedNonlinearPattern.h b/alib2data/src/tree/ranked/RankedNonlinearPattern.h index 6204c489890ac59e3beffd226c2c3c81a2122ea8..bc8879c74936d100d3a50207687be644b63b73d2 100644 --- a/alib2data/src/tree/ranked/RankedNonlinearPattern.h +++ b/alib2data/src/tree/ranked/RankedNonlinearPattern.h @@ -120,6 +120,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RankedNonlinearPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( RankedNonlinearPattern < > ) == typeid ( RankedNonlinearPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/RankedPattern.h b/alib2data/src/tree/ranked/RankedPattern.h index f2191f1e0e84916226b61432f5bdaf97b5e93486..afb2c4dc51ff65f4df8d3ca613ef380065d5d36a 100644 --- a/alib2data/src/tree/ranked/RankedPattern.h +++ b/alib2data/src/tree/ranked/RankedPattern.h @@ -114,6 +114,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RankedPattern < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( RankedPattern < > ) == typeid ( RankedPattern < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/ranked/RankedTree.h b/alib2data/src/tree/ranked/RankedTree.h index df92d6a98513c4ae7acda8616c7181ef8284ada5..608f6fbcff6c5bca4ef088a39302a98c39fbcb3c 100644 --- a/alib2data/src/tree/ranked/RankedTree.h +++ b/alib2data/src/tree/ranked/RankedTree.h @@ -111,6 +111,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef RankedTree < > normalized_type; + virtual RankedTreeBase * normalize ( ) && { if ( typeid ( RankedTree < > ) == typeid ( RankedTree < SymbolType, RankType > ) ) return this; diff --git a/alib2data/src/tree/unranked/PrefixBarTree.h b/alib2data/src/tree/unranked/PrefixBarTree.h index bb465edfd48cff5dd44fe2c73bae7bfb186e6366..f1e117ffbd0be006b199a41fb90ebf56e796e099 100644 --- a/alib2data/src/tree/unranked/PrefixBarTree.h +++ b/alib2data/src/tree/unranked/PrefixBarTree.h @@ -101,6 +101,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef PrefixBarTree < > normalized_type; + virtual UnrankedTreeBase * normalize ( ) && { if ( typeid ( PrefixBarTree < > ) == typeid ( PrefixBarTree < SymbolType > ) ) return this; diff --git a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h index 7cbb4d6a73efcdd65c5315c79429d57d9cd105a7..4fbae19c365b27f91ccb8485a56ac0af25a5c53d 100644 --- a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h +++ b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h @@ -124,6 +124,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef UnrankedNonlinearPattern < > normalized_type; + virtual UnrankedTreeBase * normalize ( ) && { if ( typeid ( UnrankedNonlinearPattern < > ) == typeid ( UnrankedNonlinearPattern < SymbolType > ) ) return this; diff --git a/alib2data/src/tree/unranked/UnrankedPattern.h b/alib2data/src/tree/unranked/UnrankedPattern.h index 712d8ed1949b05fbcf03e3883bd18e83c4b1b4b7..ceb97d51949158f0aa150087f6b41659860bacf6 100644 --- a/alib2data/src/tree/unranked/UnrankedPattern.h +++ b/alib2data/src/tree/unranked/UnrankedPattern.h @@ -112,6 +112,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef UnrankedPattern < > normalized_type; + virtual UnrankedTreeBase * normalize ( ) && { if ( typeid ( UnrankedPattern < > ) == typeid ( UnrankedPattern < SymbolType > ) ) return this; diff --git a/alib2data/src/tree/unranked/UnrankedTree.h b/alib2data/src/tree/unranked/UnrankedTree.h index ef7a640e4a19b2da0f75f81dc3215e71097ddf8e..680809ce209c9c9e1187d589bc1e999ae8a1259f 100644 --- a/alib2data/src/tree/unranked/UnrankedTree.h +++ b/alib2data/src/tree/unranked/UnrankedTree.h @@ -107,6 +107,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef UnrankedTree < > normalized_type; + virtual UnrankedTreeBase * normalize ( ) && { if ( typeid ( UnrankedTree < > ) == typeid ( UnrankedTree < SymbolType > ) ) return this; diff --git a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h index 5b67f45fc5ebf31447d7b7bf3f81bd4ee34f9cb6..a3798cb92b36db2465043f62aea45fa1f3d3a78b 100644 --- a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h +++ b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h @@ -91,6 +91,8 @@ public: alib::ObjectBase * inc ( ) && override; + typedef AdjacencyListDirectedGraph normalized_type; + virtual AdjacencyListDirectedGraph * normalize ( ) && override { return this; } diff --git a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h index 9bb8b67051d5b191274db6d20c0cc510abf7dc42..994adf0f685cadec64d13d1b8213f5d094c53bff 100644 --- a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h +++ b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h @@ -94,6 +94,8 @@ public: alib::ObjectBase * inc ( ) && override; + typedef AdjacencyMatrixDirectedGraph normalized_type; + virtual AdjacencyMatrixDirectedGraph * normalize ( ) && override { return this; } diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h index 52e931c513d4194783f2bca0ae91d27c58daea49..43796654b41ea141b6837a371508154faa75234b 100644 --- a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h +++ b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h @@ -88,6 +88,8 @@ public: alib::ObjectBase * inc ( ) && override; + typedef AdjacencyListUndirectedGraph normalized_type; + virtual AdjacencyListUndirectedGraph * normalize ( ) && override { return this; } diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h index 62b32d1064184261abad5a3438057f2ccad25233..5245f7794bfae5aa829cb75cd77447147c9064a7 100644 --- a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h +++ b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h @@ -91,6 +91,8 @@ public: alib::ObjectBase * inc ( ) && override; + typedef AdjacencyMatrixUndirectedGraph normalized_type; + virtual AdjacencyMatrixUndirectedGraph * normalize ( ) && override { return this; } diff --git a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h index b384d6cfd613b2c41fb7130f881a400765b6ad8b..45ce08bbee17cdce7ad9aa8ae8c58a20666f2389 100644 --- a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h +++ b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h @@ -109,6 +109,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef SuffixTrieTerminatingSymbol normalized_type; + virtual SuffixTrieTerminatingSymbol * normalize ( ) && { return this; } diff --git a/alib2data_experimental/src/label/LR0ItemsLabel.h b/alib2data_experimental/src/label/LR0ItemsLabel.h index 8e19c6b8feec677bd3db6187b0eff024e97d2eb8..fd3d1b0d28e89dc4ce350c915c9ed6807e50d9d2 100644 --- a/alib2data_experimental/src/label/LR0ItemsLabel.h +++ b/alib2data_experimental/src/label/LR0ItemsLabel.h @@ -78,6 +78,8 @@ public: virtual LabelBase * inc ( ) &&; + typedef LR0ItemsLabel normalized_type; + virtual LR0ItemsLabel * normalize ( ) && { return this; } diff --git a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h index ec33758c1a7b90de844df9ab85bab6d286516e58..829635e6e8fb44c39c4e4beb6a9ea6457f1be9c4 100644 --- a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h +++ b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h @@ -92,6 +92,8 @@ public: virtual alib::ObjectBase * inc ( ) &&; + typedef LinearStringTerminatingSymbol normalized_type; + virtual LinearStringTerminatingSymbol * normalize ( ) && { return this; }