From 545534d78f4a6aaff9f9286c99f59c06191df146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz>
Date: Thu, 30 Dec 2021 11:30:57 +0100
Subject: [PATCH] tidy: more count -> contains replacements
---
alib2algo/src/arbology/exact/ExactPatternMatch.h | 2 +-
alib2algo/src/tree/exact/BackwardOccurrenceTest.h | 6 +++---
alib2algo/src/tree/exact/ForwardOccurrenceTest.h | 10 +++++-----
alib2algo/src/tree/properties/BorderArrayNaive.h | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/alib2algo/src/arbology/exact/ExactPatternMatch.h b/alib2algo/src/arbology/exact/ExactPatternMatch.h
index e82877c447..f69338bb8a 100644
--- a/alib2algo/src/arbology/exact/ExactPatternMatch.h
+++ b/alib2algo/src/arbology/exact/ExactPatternMatch.h
@@ -194,7 +194,7 @@ template < class SymbolType >
bool ExactPatternMatch::matchHelper ( const ext::tree < common::ranked_symbol < SymbolType > > & subject, const ext::tree < common::ranked_symbol < SymbolType > > & pattern, const common::ranked_symbol < SymbolType > & subtreeVariable, const ext::set < common::ranked_symbol < SymbolType > > & nonlinearVariables, const ext::tree < common::ranked_symbol < unsigned > > & repeats, ext::map < common::ranked_symbol < SymbolType >, unsigned > & variablesSetting ) {
if ( pattern.getData ( ) == subtreeVariable ) return true;
- if ( nonlinearVariables.count ( pattern.getData ( ) ) ) {
+ if ( nonlinearVariables.contains ( pattern.getData ( ) ) ) {
auto setting = variablesSetting.find ( pattern.getData ( ) );
if ( setting != variablesSetting.end ( ) ) return repeats.getData ( ).getSymbol ( ) == setting->second;
diff --git a/alib2algo/src/tree/exact/BackwardOccurrenceTest.h b/alib2algo/src/tree/exact/BackwardOccurrenceTest.h
index e05be3f1aa..5568c8e316 100644
--- a/alib2algo/src/tree/exact/BackwardOccurrenceTest.h
+++ b/alib2algo/src/tree/exact/BackwardOccurrenceTest.h
@@ -42,7 +42,7 @@ ext::pair < int, int > BackwardOccurrenceTest::occurrence ( const PrefixRankedBa
// match of symbol
offset = offset - 1;
j = j - 1;
- } else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( subject.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
+ } else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( subject.getBars ( ).contains ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
// match of variable with subtree
offset = subjectSubtreeJumpTable[offset];
j = j - 2;
@@ -71,13 +71,13 @@ ext::pair < int, int > BackwardOccurrenceTest::occurrence ( const PrefixRankedBa
// match of symbol
offset = offset - 1;
j = j - 1;
- } else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( subject.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
+ } else if ( ( pattern.getContent ( )[j] == pattern.getVariablesBar ( ) ) && ( subject.getBars ( ).contains ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
// else match of variable with subtree
offset = subjectSubtreeJumpTable[offset];
j = j - 2;
// check nonlinear variable
- if ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[ j + 1 ] ) ) {
+ if ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( )[ j + 1 ] ) ) {
auto setting = variablesSetting.find ( pattern.getContent ( )[ j + 1 ] );
if ( setting != variablesSetting.end ( ) && repeats.getContent ( )[ offset + 1 ].getSymbol ( ) != setting->second )
diff --git a/alib2algo/src/tree/exact/ForwardOccurrenceTest.h b/alib2algo/src/tree/exact/ForwardOccurrenceTest.h
index 896df8a084..09b4ab97cb 100644
--- a/alib2algo/src/tree/exact/ForwardOccurrenceTest.h
+++ b/alib2algo/src/tree/exact/ForwardOccurrenceTest.h
@@ -49,7 +49,7 @@ size_t ForwardOccurrenceTest::occurrence ( const PrefixRankedBarTree < SymbolTyp
// match of symbol
offset = offset + 1;
j = j + 1;
- } else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) && ( ! subject.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
+ } else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) ) && ( ! subject.getBars ( ).contains ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
// match of variable with subtree
offset = subjectSubtreeJumpTable[offset];
j = j + 2;
@@ -76,9 +76,9 @@ size_t ForwardOccurrenceTest::occurrence ( const PrefixRankedBarTree < SymbolTyp
// match of symbol
offset = offset + 1;
j = j + 1;
- } else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[j] ) ) && ( ! subject.getBars ( ).count ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
+ } else if ( ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( )[j] ) ) && ( ! subject.getBars ( ).contains ( subject.getContent ( )[offset] ) ) ) { //the second part of the condition is needed to handle S |S
// check nonlinear variable
- if ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[ j ] ) ) {
+ if ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( )[ j ] ) ) {
auto setting = variablesSetting.find ( pattern.getContent ( )[ j ] );
if ( setting != variablesSetting.end ( ) && repeats.getContent ( )[ offset ].getSymbol ( ) != setting->second )
@@ -143,9 +143,9 @@ size_t ForwardOccurrenceTest::occurrence ( const PrefixRankedTree < SymbolType >
if ( subject.getContent ( )[offset] == pattern.getContent ( )[j] )
// match of symbol
offset = offset + 1;
- else if ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[ j ] ) ) {
+ else if ( pattern.getContent ( )[j] == pattern.getSubtreeWildcard ( ) || pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( )[ j ] ) ) {
// check nonlinear variable
- if ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( )[ j ] ) ) {
+ if ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( )[ j ] ) ) {
auto setting = variablesSetting.find ( pattern.getContent ( )[ j ] );
if ( setting != variablesSetting.end ( ) && repeats.getContent ( )[ offset ].getSymbol ( ) != setting->second )
diff --git a/alib2algo/src/tree/properties/BorderArrayNaive.h b/alib2algo/src/tree/properties/BorderArrayNaive.h
index c3d123f823..2fda47ed38 100644
--- a/alib2algo/src/tree/properties/BorderArrayNaive.h
+++ b/alib2algo/src/tree/properties/BorderArrayNaive.h
@@ -86,8 +86,8 @@ bool BorderArrayNaive::matches ( const tree::PrefixRankedBarNonlinearPattern < S
if ( pattern.getContent ( )[i] == pattern.getContent ( )[offset] ) {
i++;
offset++;
- } else if ( ( pattern.getContent ( )[i] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( ) [ i ] ) )
- || ( pattern.getContent ( )[offset] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( ) [ offset ] ) ) ) {
+ } else if ( ( pattern.getContent ( )[i] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( ) [ i ] ) )
+ || ( pattern.getContent ( )[offset] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( ) [ offset ] ) ) ) {
i = subtreeJumpTable[i];
offset = subtreeJumpTable[offset];
} else {
@@ -122,8 +122,8 @@ bool BorderArrayNaive::matches ( const tree::PrefixRankedNonlinearPattern < Symb
if ( pattern.getContent ( )[i] == pattern.getContent ( )[offset] ) {
i++;
offset++;
- } else if ( ( pattern.getContent ( )[i] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( ) [ i ] ) )
- || ( pattern.getContent ( )[offset] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).count ( pattern.getContent ( ) [ offset ] ) ) ) {
+ } else if ( ( pattern.getContent ( )[i] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( ) [ i ] ) )
+ || ( pattern.getContent ( )[offset] == pattern.getSubtreeWildcard ( ) ) || ( pattern.getNonlinearVariables ( ).contains ( pattern.getContent ( ) [ offset ] ) ) ) {
i = subtreeJumpTable[i];
offset = subtreeJumpTable[offset];
} else {
--
GitLab