+ normalize methods in Base and Wrapper classes

alib2common/src/base/CommonBase.hpp

@@ -67,6 +67,8 @@ public:
 template< typename T >
 class CommonBase : public CommonBaseMiddle < T > {
+public:
+	virtual T * normalize ( ) && = 0;
 };
 } /* namespace alib */

alib2common/src/base/WrapperBase.hpp

@@ -125,6 +125,10 @@ class WrapperBase : public WrapperBaseMiddle < T > {
 public:
 	using WrapperBaseMiddle < T >::WrapperBaseMiddle;
+	void normalize ( ) {
+		this->setData ( std::move ( this->getData ( ) ).normalize ( ) );
+	}
+
 };
 } /* namespace alib */

alib2common/src/object/ObjectBase.h

@@ -26,6 +26,8 @@ public:
 	virtual ObjectBase * plunder() && = 0;
 	virtual ObjectBase * inc() && = 0;
+
+	virtual ObjectBase * normalize() && = 0;
 };
 } /* namespace alib */

alib2data/src/indexes/arbology/FullAndLinearIndex.h

@@ -115,7 +115,7 @@ public:
 	virtual alib::ObjectBase * inc ( ) &&;
 	virtual ObjectBase * normalize ( ) && {
-		indexes::stringology::PositionHeap < DefaultSymbolType > stringIndex = manage_move ( std::move ( m_StringIndex ).normalize ( ) );
+		indexes::stringology::PositionHeap < DefaultSymbolType > stringIndex = std::move ( m_StringIndex ).normalizeRaw ( );
 		return new FullAndLinearIndex < > ( std::move ( stringIndex ), std::move ( m_JumpTable ) );
 	}

alib2data/src/indexes/stringology/PositionHeap.h

@@ -122,12 +122,16 @@ public:
 	virtual alib::ObjectBase * inc ( ) &&;
-	virtual PositionHeap < > * normalize ( ) && {
+	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 ) );
 		std::vector < DefaultSymbolType > string = alphabet::SymbolNormalize::normalizeSymbols ( std::move ( m_string ) );
-		return new PositionHeap < > ( std::move ( alphabet ), std::move ( trie ), std::move ( string ) );
+		return PositionHeap < > ( std::move ( alphabet ), std::move ( trie ), std::move ( string ) );
+	}
+
+	virtual alib::ObjectBase * normalize ( ) && {
+		return std::move ( * this ).normalizeRaw ( ).plunder ( );
 	}
 };

alib2data/src/indexes/stringology/SuffixTrie.h

@@ -122,7 +122,7 @@ public:
 	virtual alib::ObjectBase * inc ( ) &&;
-	virtual SuffixTrie < > * normalize ( ) && {
+	virtual alib::ObjectBase * normalize ( ) && {
 		std::set < DefaultSymbolType > alphabet = alphabet::SymbolNormalize::normalizeAlphabet ( std::move ( this->template accessComponent < GeneralAlphabet > ( ).get ( ) ) );
 		std::trie < DefaultSymbolType, std::variant < void, unsigned > > trie = IndexesNormalize::normalizeTrie ( std::move ( m_trie ) );

alib2data/src/rte/formal/FormalRTEElement.h

@@ -17,7 +17,7 @@
 namespace rte {
 template < class SymbolType, class RankType >
-class FormalRTEElement : public alib::CommonBase < FormalRTEElement < SymbolType, RankType > >, public std::BaseNode < FormalRTEElement < SymbolType, RankType > > {
+class FormalRTEElement : public alib::CommonBaseMiddle < FormalRTEElement < SymbolType, RankType > >, public std::BaseNode < FormalRTEElement < SymbolType, RankType > > {
 public:
 	class Visitor {
 	public:

alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h

@@ -91,7 +91,7 @@ public:
 	alib::ObjectBase * inc ( ) && override;
-	virtual AdjacencyListDirectedGraph * normalize ( ) && {
+	virtual AdjacencyListDirectedGraph * normalize ( ) && override {
 		return this;
 	}
 };

alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h

@@ -94,7 +94,7 @@ public:
 	alib::ObjectBase * inc ( ) && override;
-	virtual AdjacencyMatrixDirectedGraph * normalize ( ) && {
+	virtual AdjacencyMatrixDirectedGraph * normalize ( ) && override {
 		return this;
 	}
 };

alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h

@@ -88,7 +88,7 @@ public:
 	alib::ObjectBase * inc ( ) && override;
-	virtual AdjacencyListUndirectedGraph * normalize ( ) && {
+	virtual AdjacencyListUndirectedGraph * normalize ( ) && override {
 		return this;
 	}
 };

alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h

@@ -91,7 +91,7 @@ public:
 	alib::ObjectBase * inc ( ) && override;
-	virtual AdjacencyMatrixUndirectedGraph * normalize ( ) && {
+	virtual AdjacencyMatrixUndirectedGraph * normalize ( ) && override {
 		return this;
 	}
 };