optimize some arbology algos

alib2algo/src/arbology/exact/BoyerMooreHorspool.h

@@ -72,7 +72,7 @@ ext::set < unsigned > BoyerMooreHorspool::match ( const tree::PrefixRankedBarTre
 				 // match of symbol
 				offset = offset - 1;
 				j = j - 1;
-			} else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) {
+			} else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) /* && ( pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 				 // match of variable with subtree
 				offset = subjectSubtreeJumpTable[offset];
 				j = j - 2;
@@ -119,7 +119,7 @@ ext::set < unsigned > BoyerMooreHorspool::match ( const tree::PrefixRankedBarTre
 				 // match of symbol
 				offset = offset - 1;
 				j = j - 1;
-			} else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( pattern.getBars ( ).count ( subject.getContent ( )[offset] )) ) {
+			} else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) /* && ( pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 				 // else match of variable with subtree
 				offset = subjectSubtreeJumpTable[offset];
 				j = j - 2;

alib2algo/src/arbology/exact/DeadZoneUsingBadCharacterShiftAndBorderArray.h

@@ -85,7 +85,7 @@ void DeadZoneUsingBadCharacterShiftAndBorderArray::match_rec ( ext::set < unsign
 			 // match of symbol
 			offset++;
 			j++;
-		} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] )  ) ) {
+		} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) /* && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 			 // match of variable with subtree
 			offset = subjectSubtreeJumpTable[offset];
 			j += 2;

alib2algo/src/arbology/exact/KnuthMorrisPratt.h

@@ -73,7 +73,7 @@ ext::set < unsigned > KnuthMorrisPratt::match ( const tree::PrefixRankedBarTree
 				 // match of symbol
 				offset++;
 				j++;
-			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) {
+			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) /* && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 				 // match of variable with subtree
 				offset = subjectSubtreeJumpTable[offset];
 				j += 2;

alib2algo/src/arbology/exact/ReversedBoyerMooreHorspool.h

@@ -80,7 +80,7 @@ ext::set < unsigned > ReversedBoyerMooreHorspool::match ( const tree::PrefixRank
 				 // match of symbol
 				offset = offset + 1;
 				j = j + 1;
-			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] )  ) ) {
+			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) /* && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 				 // match of variable with subtree
 				offset = subjectSubtreeJumpTable[offset];
 				j = j + 2;
@@ -127,7 +127,7 @@ ext::set < unsigned > ReversedBoyerMooreHorspool::match ( const tree::PrefixRank
 				 // match of symbol
 				offset = offset + 1;
 				j = j + 1;
-			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[j] ) ) && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) {
+			} else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[j] ) ) /* && ( ! pattern.getBars ( ).count ( subject.getContent ( )[offset] ) ) */ ) {
 				 // check nonlinear variable
 				if ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[ j ] ) ) {
 					auto setting = variablesSetting.find ( pattern.getContent ( )[ j ] );