diff --git a/alib2algo/src/stringology/query/BitParallelismFactors.h b/alib2algo/src/stringology/query/BitParallelismFactors.h index a58aeded56c77a60c3267d184f422ae6f3a11af2..f71a9cc0f35b294fc40f1238525959396090b064 100644 --- a/alib2algo/src/stringology/query/BitParallelismFactors.h +++ b/alib2algo/src/stringology/query/BitParallelismFactors.h @@ -50,20 +50,20 @@ ext::set < unsigned > BitParallelismFactors::query ( const indexes::stringology: if ( symbolVectorIter == bitParallelIndex.getData ( ).end ( ) ) return { }; - ext::vector < bool > indexVector = symbolVectorIter->second << 1; + ext::vector < bool > indexVector = symbolVectorIter->second; for ( ++ symbolIter; symbolIter != string.getContent ( ).end ( ); ++ symbolIter ) { symbolVectorIter = bitParallelIndex.getData ( ).find ( * symbolIter ); if ( symbolVectorIter == bitParallelIndex.getData ( ).end ( ) ) return { }; - indexVector = ( indexVector & symbolVectorIter->second ) << 1; + indexVector = ( indexVector << 1 ) & symbolVectorIter->second; } ext::set < unsigned > res; for ( unsigned i = 0; i < indexVector.size ( ); i++ ) if ( indexVector [ i ] ) - res.insert ( i - string.getContent ( ).size ( ) ); + res.insert ( i - string.getContent ( ).size ( ) + 1 ); return res; } diff --git a/alib2algo/src/stringology/query/CompressedBitParallelismFactors.h b/alib2algo/src/stringology/query/CompressedBitParallelismFactors.h index e11f45ff9200ff184819c6cffd194abb27a73380..474ebe3a4ad4beed6727b589d1ea11af43409217 100644 --- a/alib2algo/src/stringology/query/CompressedBitParallelismFactors.h +++ b/alib2algo/src/stringology/query/CompressedBitParallelismFactors.h @@ -51,20 +51,20 @@ ext::set < unsigned > CompressedBitParallelismFactors::query ( const indexes::st if ( symbolVectorIter == compressedBitParallelIndex.getData ( ).end ( ) ) return { }; - common::SparseBoolVector indexVector = symbolVectorIter->second << 1; + common::SparseBoolVector indexVector = symbolVectorIter->second; for ( ++ symbolIter; symbolIter != string.getContent ( ).end ( ); ++ symbolIter ) { symbolVectorIter = compressedBitParallelIndex.getData ( ).find ( * symbolIter ); if ( symbolVectorIter == compressedBitParallelIndex.getData ( ).end ( ) ) return { }; - indexVector = ( indexVector & symbolVectorIter->second ) << 1; + indexVector = ( indexVector << 1 ) & symbolVectorIter->second; } ext::set < unsigned > res; for ( unsigned i : indexVector ) - res.insert ( i - string.getContent ( ).size ( ) ); + res.insert ( i - string.getContent ( ).size ( ) + 1 ); return res; }