From 9f6a151736f5b9ac4ae409d5f0c5b451fa5a551f 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: Wed, 26 Jan 2022 18:47:37 +0100 Subject: [PATCH] tidy: make declarations isolated --- alib2algo/src/stringology/exact/QuiteNaive.h | 6 ++++-- alib2algo/src/stringology/exact/SequentialSampling.h | 3 ++- alib2algo/src/stringology/exact/TailedSubstring.h | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/alib2algo/src/stringology/exact/QuiteNaive.h b/alib2algo/src/stringology/exact/QuiteNaive.h index 940fa26f09..b217b925b7 100644 --- a/alib2algo/src/stringology/exact/QuiteNaive.h +++ b/alib2algo/src/stringology/exact/QuiteNaive.h @@ -34,11 +34,13 @@ namespace stringology { ext::set<unsigned> occ; const auto & text = subject.getContent(); const auto & pat = pattern.getContent(); - size_t n = text.size(), m = pat.size(); + size_t n = text.size(); + size_t m = pat.size(); measurements::start ( "Preprocess", measurements::Type::PREPROCESS ); // Preprocessing - size_t gamma = 1 , delta = 1 ; + size_t gamma = 1; + size_t delta = 1; while ( delta < m && pat[m-1] != pat[m-1-delta]) ++ delta; while ( gamma < m && pat[m-1] == pat[m-1-gamma]) ++ gamma; measurements::end() ; diff --git a/alib2algo/src/stringology/exact/SequentialSampling.h b/alib2algo/src/stringology/exact/SequentialSampling.h index df278e9c6e..776d595772 100644 --- a/alib2algo/src/stringology/exact/SequentialSampling.h +++ b/alib2algo/src/stringology/exact/SequentialSampling.h @@ -66,7 +66,8 @@ ext::set < unsigned > SeqSampling ( const string::LinearString < SymbolType > & ext::set<unsigned> occ; const auto & text = subject.getContent(); const auto & pat = pattern.getContent(); - size_t n = text.size(), m = pat.size(); + size_t n = text.size(); + size_t m = pat.size(); size_t i = 0; while ( i <= n - m ) { diff --git a/alib2algo/src/stringology/exact/TailedSubstring.h b/alib2algo/src/stringology/exact/TailedSubstring.h index f8dd54c886..30492f480a 100644 --- a/alib2algo/src/stringology/exact/TailedSubstring.h +++ b/alib2algo/src/stringology/exact/TailedSubstring.h @@ -34,12 +34,13 @@ namespace stringology { ext::set<unsigned> occ; const auto & text = subject.getContent(); const auto & pat = pattern.getContent(); - long int n = text.size(), m = pat.size(); + long int n = text.size(); + long int m = pat.size(); long int s = 0; long int delta = 1; - long int i , k; - i = k = m - 1; + long int i = m - 1; + long int k = i; measurements::start ( "Algorithm", measurements::Type::ALGORITHM ); // Phase 1 -- GitLab