safer use of full and linear indexes

alib2algo/src/arbology/query/FullAndLinearIndexPatterns.h

@@ -68,7 +68,7 @@ public:
 template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
 ext::set < unsigned > FullAndLinearIndexPatterns::query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedPattern < SymbolType, RankType > & pattern ) {
-	ext::vector < unsigned > rev ( fullAndLinearIndex.getString ( ).size ( ), ( unsigned ) -1 );
+	ext::vector < unsigned > rev ( fullAndLinearIndex.getJumps ( ).size ( ), ( unsigned ) -1 );
 	ext::vector < ext::vector < common::ranked_symbol < SymbolType, RankType > > > treePatternParts;
 	treePatternParts.push_back ( ext::vector < common::ranked_symbol < SymbolType, RankType > > ( ) );
@@ -100,7 +100,7 @@ ext::set < unsigned > FullAndLinearIndexPatterns::query ( const indexes::arbolog
 template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
 ext::set < unsigned > FullAndLinearIndexPatterns::query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedBarPattern < SymbolType, RankType > & pattern ) {
-	ext::vector < unsigned > rev ( fullAndLinearIndex.getString ( ).size ( ), ( unsigned ) -1 );
+	ext::vector < unsigned > rev ( fullAndLinearIndex.getJumps ( ).size ( ), ( unsigned ) -1 );
 	ext::vector < ext::vector < common::ranked_symbol < SymbolType, RankType > > > treePatternParts;
 	treePatternParts.push_back ( ext::vector < common::ranked_symbol < SymbolType, RankType > > ( ) );

alib2algo/src/arbology/query/NonlinearFullAndLinearIndexPatterns.h

@@ -69,7 +69,7 @@ public:
 template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
 ext::set < unsigned > NonlinearFullAndLinearIndexPatterns::query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedNonlinearPattern < SymbolType, RankType > & pattern ) {
 	ext::map < std::pair < unsigned, common::ranked_symbol < SymbolType, RankType > >, unsigned > nonlinearVariablesMap;
-	ext::vector < unsigned > rev ( fullAndLinearIndex.getString ( ).size ( ), ( unsigned ) -1 );
+	ext::vector < unsigned > rev ( fullAndLinearIndex.getJumps ( ).size ( ), ( unsigned ) -1 );
 	ext::vector < ext::vector < common::ranked_symbol < SymbolType, RankType > > > treePatternParts;
 	treePatternParts.push_back ( ext::vector < common::ranked_symbol < SymbolType, RankType > > ( ) );
@@ -115,7 +115,7 @@ ext::set < unsigned > NonlinearFullAndLinearIndexPatterns::query ( const indexes
 template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
 ext::set < unsigned > NonlinearFullAndLinearIndexPatterns::query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedBarNonlinearPattern < SymbolType, RankType > & pattern ) {
 	ext::map < std::pair < unsigned, common::ranked_symbol < SymbolType, RankType > >, unsigned > nonlinearVariablesMap;
-	ext::vector < unsigned > rev ( fullAndLinearIndex.getString ( ).size ( ), ( unsigned ) -1 );
+	ext::vector < unsigned > rev ( fullAndLinearIndex.getJumps ( ).size ( ), ( unsigned ) -1 );
 	ext::vector < ext::vector < common::ranked_symbol < SymbolType, RankType > > > treePatternParts;
 	treePatternParts.push_back ( ext::vector < common::ranked_symbol < SymbolType, RankType > > ( ) );

alib2data/src/indexes/arbology/FullAndLinearIndex.h

@@ -72,10 +72,6 @@ public:
 	ext::vector < int > && getJumps ( ) &&;
-	const ext::vector < common::ranked_symbol < SymbolType, RankType > > & getString ( ) const &;
-
-	ext::vector < common::ranked_symbol < SymbolType, RankType > > && getString ( ) &&;
-
 	const ext::set < common::ranked_symbol < SymbolType, RankType > > & getAlphabet ( ) const & {
 		return m_StringIndex.getAlphabet ( );
 	}
@@ -162,16 +158,6 @@ ext::vector < int > && FullAndLinearIndex < SymbolType, RankType, StringIndex >:
 	return std::move ( m_JumpTable );
 }
-template < class SymbolType, class RankType, template < typename > class StringIndex >
-const ext::vector < common::ranked_symbol < SymbolType, RankType > > & FullAndLinearIndex < SymbolType, RankType, StringIndex >::getString ( ) const & {
-	return m_StringIndex.getString ( );
-}
-
-template < class SymbolType, class RankType, template < typename > class StringIndex >
-ext::vector < common::ranked_symbol < SymbolType, RankType > > && FullAndLinearIndex < SymbolType, RankType, StringIndex >::getString ( ) && {
-	return std::move ( m_StringIndex ).getString ( );
-}
-
 template < class SymbolType, class RankType, template < typename > class StringIndex >
 void FullAndLinearIndex < SymbolType, RankType, StringIndex >::setStringIndex ( indexes::stringology::PositionHeap < common::ranked_symbol < SymbolType, RankType > > stringIndex ) {
 	this->m_StringIndex = std::move ( stringIndex );

alib2data/src/indexes/arbology/NonlinearFullAndLinearIndex.h

@@ -80,10 +80,6 @@ public:
 	ext::vector < unsigned > && getRepeats ( ) &&;
-	const ext::vector < common::ranked_symbol < SymbolType, RankType > > & getString ( ) const &;
-
-	ext::vector < common::ranked_symbol < SymbolType, RankType > > && getString ( ) &&;
-
 	const ext::set < common::ranked_symbol < SymbolType, RankType > > & getAlphabet ( ) const & {
 		return m_StringIndex.getAlphabet ( );
 	}
@@ -180,16 +176,6 @@ ext::vector < unsigned > && NonlinearFullAndLinearIndex < SymbolType, RankType,
 	return std::move ( m_Repeats );
 }
-template < class SymbolType, class RankType, template < typename > class StringIndex >
-const ext::vector < common::ranked_symbol < SymbolType, RankType > > & NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex >::getString ( ) const & {
-	return m_StringIndex.getString ( );
-}
-
-template < class SymbolType, class RankType, template < typename > class StringIndex >
-ext::vector < common::ranked_symbol < SymbolType, RankType > > && NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex >::getString ( ) && {
-	return std::move ( m_StringIndex ).getString ( );
-}
-
 template < class SymbolType, class RankType, template < typename > class StringIndex >
 void NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex >::setStringIndex ( StringIndex < common::ranked_symbol < SymbolType, RankType > > stringIndex ) {
 	this->m_StringIndex = std::move ( stringIndex );