Skip to content
Snippets Groups Projects
Commit 415c8f7a authored by Jan Trávníček's avatar Jan Trávníček
Browse files

tidy: use named constant

parent 728713a1
No related branches found
No related tags found
1 merge request!200clang tidy fixes
...@@ -7,8 +7,12 @@ ...@@ -7,8 +7,12 @@
   
namespace automaton::generate { namespace automaton::generate {
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
automaton::NFA < std::string, unsigned > NumberOfSymbolsAutomaton::generateNFA ( size_t modulo, size_t alphabetSize, bool randomizedAlphabet, char symbol, size_t final_modulo ) { automaton::NFA < std::string, unsigned > NumberOfSymbolsAutomaton::generateNFA ( size_t modulo, size_t alphabetSize, bool randomizedAlphabet, char symbol, size_t final_modulo ) {
if ( alphabetSize > 26 ) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big alphabet."); throw exception::CommonException("Too big alphabet.");
   
if ( alphabetSize < 1 ) if ( alphabetSize < 1 )
......
...@@ -3,8 +3,12 @@ ...@@ -3,8 +3,12 @@
   
namespace automaton::generate { namespace automaton::generate {
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
automaton::NFTA < std::string, unsigned > RandomTreeAutomatonFactory::generateNFTA( size_t statesCount, size_t alphabetSize, size_t maxRank, bool randomizedAlphabet, double density ) { automaton::NFTA < std::string, unsigned > RandomTreeAutomatonFactory::generateNFTA( size_t statesCount, size_t alphabetSize, size_t maxRank, bool randomizedAlphabet, double density ) {
if(alphabetSize > 26) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big alphabet."); throw exception::CommonException("Too big alphabet.");
   
if(alphabetSize < 1) if(alphabetSize < 1)
......
...@@ -3,8 +3,12 @@ ...@@ -3,8 +3,12 @@
   
namespace grammar::generate { namespace grammar::generate {
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactory::generateCFG ( size_t nonterminalsCount, size_t terminalsCount, bool randomizedAlphabet, double density ) { grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactory::generateCFG ( size_t nonterminalsCount, size_t terminalsCount, bool randomizedAlphabet, double density ) {
if(terminalsCount > 26) if ( terminalsCount > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big terminals count."); throw exception::CommonException("Too big terminals count.");
   
ext::deque < std::string > terminals; ext::deque < std::string > terminals;
...@@ -16,7 +20,7 @@ grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactor ...@@ -16,7 +20,7 @@ grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactor
   
terminals.resize ( terminalsCount ); terminals.resize ( terminalsCount );
   
if(nonterminalsCount > 26) if ( nonterminalsCount > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big nonterminals count."); throw exception::CommonException("Too big nonterminals count.");
   
ext::deque < std::string > nonterminals; ext::deque < std::string > nonterminals;
......
...@@ -9,8 +9,12 @@ ...@@ -9,8 +9,12 @@
   
namespace regexp::generate { namespace regexp::generate {
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
regexp::UnboundedRegExp < std::string > regexp::generate::RandomRegExpFactory::generateUnboundedRegExp( size_t leafNodes, size_t height, size_t alphabetSize, bool randomizedAlphabet ) { regexp::UnboundedRegExp < std::string > regexp::generate::RandomRegExpFactory::generateUnboundedRegExp( size_t leafNodes, size_t height, size_t alphabetSize, bool randomizedAlphabet ) {
if ( alphabetSize > 26 ) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException( "Too big alphabet." ); throw exception::CommonException( "Too big alphabet." );
   
if ( alphabetSize <= 0 ) if ( alphabetSize <= 0 )
...@@ -31,7 +35,7 @@ regexp::UnboundedRegExp < std::string > regexp::generate::RandomRegExpFactory::g ...@@ -31,7 +35,7 @@ regexp::UnboundedRegExp < std::string > regexp::generate::RandomRegExpFactory::g
template < class SymbolType > template < class SymbolType >
regexp::UnboundedRegExp < SymbolType > regexp::generate::RandomRegExpFactory::generateUnboundedRegExp( size_t leafNodes, size_t height, ext::set < SymbolType > alphabet) { regexp::UnboundedRegExp < SymbolType > regexp::generate::RandomRegExpFactory::generateUnboundedRegExp( size_t leafNodes, size_t height, ext::set < SymbolType > alphabet) {
   
if( alphabet.size() > 26) if ( alphabet.size() > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big alphabet."); throw exception::CommonException("Too big alphabet.");
   
if( alphabet.empty ( ) ) if( alphabet.empty ( ) )
......
...@@ -20,8 +20,12 @@ string::LinearString < std::string > string::generate::RandomStringFactory::gene ...@@ -20,8 +20,12 @@ string::LinearString < std::string > string::generate::RandomStringFactory::gene
return string::LinearString < std::string > ( elems ); return string::LinearString < std::string > ( elems );
} }
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
string::LinearString < std::string > string::generate::RandomStringFactory::generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet ) { string::LinearString < std::string > string::generate::RandomStringFactory::generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet ) {
if ( alphabetSize > 26 ) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException ( "Too big alphabet." ); throw exception::CommonException ( "Too big alphabet." );
   
if ( alphabetSize <= 0 ) if ( alphabetSize <= 0 )
......
...@@ -249,10 +249,15 @@ struct Node { ...@@ -249,10 +249,15 @@ struct Node {
   
}; };
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
ext::vector < char > generateUnrankedAlphabet ( size_t maxAlphabetSize, bool randomizedAlphabet ) { ext::vector < char > generateUnrankedAlphabet ( size_t maxAlphabetSize, bool randomizedAlphabet ) {
ext::vector < char > symbols ( 26 ); ext::vector < char > symbols ( ENGLISH_ALPHABET_SIZE );
   
for ( unsigned i = 0; i < 26; i++ ) symbols[i] = i + 'a'; for ( unsigned i = 0; i < ENGLISH_ALPHABET_SIZE; i ++ )
symbols [ i ] = i + 'a';
   
if ( randomizedAlphabet ) shuffle ( symbols.begin ( ), symbols.end ( ), ext::random_devices::semirandom ); if ( randomizedAlphabet ) shuffle ( symbols.begin ( ), symbols.end ( ), ext::random_devices::semirandom );
   
......
...@@ -31,8 +31,12 @@ size_t RandomAutomatonFactory2::randomTargetState ( size_t statesMinimal, size_t ...@@ -31,8 +31,12 @@ size_t RandomAutomatonFactory2::randomTargetState ( size_t statesMinimal, size_t
return -1; return -1;
} }
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
automaton::DFA < std::string, unsigned > RandomAutomatonFactory2::generateDFA( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t alphabetSize, bool randomizedAlphabet, double density ) { automaton::DFA < std::string, unsigned > RandomAutomatonFactory2::generateDFA( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t alphabetSize, bool randomizedAlphabet, double density ) {
if ( alphabetSize > 26 ) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big alphabet."); throw exception::CommonException("Too big alphabet.");
   
ext::vector < std::string > symbols; ext::vector < std::string > symbols;
......
...@@ -3,8 +3,12 @@ ...@@ -3,8 +3,12 @@
   
namespace automaton::generate { namespace automaton::generate {
   
namespace {
constexpr unsigned ENGLISH_ALPHABET_SIZE = 26;
}
automaton::MultiInitialStateNFA < std::string, unsigned > RandomAutomatonFactory3::generate ( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t initialStates, size_t finalStates, size_t alphabetSize, bool randomizedAlphabet, double density, bool deterministic ) { automaton::MultiInitialStateNFA < std::string, unsigned > RandomAutomatonFactory3::generate ( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t initialStates, size_t finalStates, size_t alphabetSize, bool randomizedAlphabet, double density, bool deterministic ) {
if ( alphabetSize > 26 ) if ( alphabetSize > ENGLISH_ALPHABET_SIZE )
throw exception::CommonException("Too big alphabet."); throw exception::CommonException("Too big alphabet.");
   
if ( initialStates > statesUseless + statesMinimal ) if ( initialStates > statesUseless + statesMinimal )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment