simplification of position heap query algorithm

alib2algo/src/stringology/query/PositionHeapFactors.h

@@ -70,29 +70,23 @@ std::set < unsigned > PositionHeapFactors::query ( const indexes::PositionHeap <
 	unsigned depth = 0;
 	unsigned indexedStringSize = positionHeap.getString ( ).size ( );
-	if(common::GlobalData::verbose)
-		std::clog << "on path possible occ (raw, string index): (" << node->getData ( ) << ", " << indexedStringSize - node->getData ( ) << ")";
-	if ( checkOcc ( string, depth, positionHeap.getString ( ), indexedStringSize - node->getData ( ) ) )
-		res.insert ( indexedStringSize - node->getData ( ) );
-	for ( const SymbolType & symbol : string.getContent ( ) ) {
+	for ( const SymbolType & symbol : string.getContent ( ) ) {
+		if(common::GlobalData::verbose)
+			std::clog << "on path possible occ (raw, string index): (" << node->getData ( ) << ", " << indexedStringSize - node->getData ( ) << ")";
+
+		if ( checkOcc ( string, depth, positionHeap.getString ( ), indexedStringSize - node->getData ( ) ) )
+			res.insert ( indexedStringSize - node->getData ( ) );
 		auto iter = node->getChildren ( ).find ( symbol );
 		if ( iter == node->getChildren ( ).end ( ) )
 			return res;
 		depth++;
 		node = & iter->second;
-
-		if(common::GlobalData::verbose)
-			std::clog << "on path possible occ (raw, string index): (" << node->getData ( ) << ", " << indexedStringSize - node->getData ( ) << ")";
-
-		if ( checkOcc ( string, depth, positionHeap.getString ( ), indexedStringSize - node->getData ( ) ) )
-			res.insert ( indexedStringSize - node->getData ( ) );
 	}
-	for ( const std::pair < SymbolType, std::trie < SymbolType, unsigned > > & child : node->getChildren ( ) )
-		accumulateResult ( child.second, res, indexedStringSize );
+	accumulateResult ( * node, res, indexedStringSize );
 	return res;
 }