From 993bd937de10bfc89f2bc2cd597da5fcdbefec33 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 3 Mar 2016 13:49:16 +0100
Subject: [PATCH] format code
---
.../string/generate/RandomStringFactory.cpp | 46 ++++++++++---------
.../src/string/generate/RandomStringFactory.h | 5 +-
.../generate/RandomSubstringFactory.cpp | 16 ++++---
.../string/generate/RandomSubstringFactory.h | 6 ++-
4 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/alib2algo/src/string/generate/RandomStringFactory.cpp b/alib2algo/src/string/generate/RandomStringFactory.cpp
index bee3413790..a583050aa1 100644
--- a/alib2algo/src/string/generate/RandomStringFactory.cpp
+++ b/alib2algo/src/string/generate/RandomStringFactory.cpp
@@ -17,39 +17,41 @@ namespace string {
namespace generate {
-string::LinearString RandomStringFactory::generateLinearString( size_t size, size_t alphabetSize, bool randomizedAlphabet ) {
- srand( time( NULL ) );
+string::LinearString RandomStringFactory::generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet ) {
+ srand ( time ( NULL ) );
- if(alphabetSize > 26)
- throw exception::AlibException("Too big alphabet.");
+ if ( alphabetSize > 26 )
+ throw exception::AlibException ( "Too big alphabet." );
- if( alphabetSize <= 0 )
- throw exception::AlibException( "Alphabet size must be greater than 0." );
+ if ( alphabetSize <= 0 )
+ throw exception::AlibException ( "Alphabet size must be greater than 0." );
- std::vector<alphabet::Symbol> symbols;
- for(int i = 0; i < 26; i++) symbols.push_back(alphabet::symbolFrom(i + 'a'));
- if(randomizedAlphabet) shuffle(symbols.begin(), symbols.end(), std::random_devices::semirandom);
- std::set<alphabet::Symbol> alphabet(symbols.begin(), symbols.begin() + alphabetSize);
+ std::vector < alphabet::Symbol > symbols;
- return RandomStringFactory::generateLinearString( size, alphabet );
+ for ( int i = 0; i < 26; i++ ) symbols.push_back ( alphabet::symbolFrom ( i + 'a' ) );
+
+ if ( randomizedAlphabet ) shuffle ( symbols.begin ( ), symbols.end ( ), std::random_devices::semirandom );
+
+ std::set < alphabet::Symbol > alphabet ( symbols.begin ( ), symbols.begin ( ) + alphabetSize );
+
+ return RandomStringFactory::generateLinearString ( size, alphabet );
}
-string::LinearString RandomStringFactory::generateLinearString( size_t size, std::set<alphabet::Symbol> alphabet) {
+string::LinearString RandomStringFactory::generateLinearString ( size_t size, std::set < alphabet::Symbol > alphabet ) {
- if( alphabet.size() > 26)
- throw exception::AlibException("Too big alphabet.");
+ if ( alphabet.size ( ) > 26 )
+ throw exception::AlibException ( "Too big alphabet." );
- if( alphabet.size() <= 0 )
- throw exception::AlibException( "Alphabet size must be greater than 0." );
+ if ( alphabet.size ( ) <= 0 )
+ throw exception::AlibException ( "Alphabet size must be greater than 0." );
- std::vector<alphabet::Symbol> alphabetList(alphabet.begin(), alphabet.end());
- std::vector<alphabet::Symbol> elems;
+ std::vector < alphabet::Symbol > alphabetList ( alphabet.begin ( ), alphabet.end ( ) );
+ std::vector < alphabet::Symbol > elems;
- for(size_t i = 0; i < size; i++) {
- elems.push_back(alphabetList[std::random_devices::semirandom() % alphabetList.size()]);
- }
+ for ( size_t i = 0; i < size; i++ )
+ elems.push_back ( alphabetList[std::random_devices::semirandom ( ) % alphabetList.size ( )] );
- return string::LinearString(elems);
+ return string::LinearString ( elems );
}
} /* namespace generate */
diff --git a/alib2algo/src/string/generate/RandomStringFactory.h b/alib2algo/src/string/generate/RandomStringFactory.h
index 6cec60b31d..7b5e784efb 100644
--- a/alib2algo/src/string/generate/RandomStringFactory.h
+++ b/alib2algo/src/string/generate/RandomStringFactory.h
@@ -17,9 +17,8 @@ namespace generate {
class RandomStringFactory {
public:
- static string::LinearString generateLinearString( size_t size, size_t alphabetSize, bool randomizedAlphabet );
- static string::LinearString generateLinearString( size_t size, std::set<alphabet::Symbol> alphabet);
-
+ static string::LinearString generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet );
+ static string::LinearString generateLinearString ( size_t size, std::set < alphabet::Symbol > alphabet );
};
} /* namespace generate */
diff --git a/alib2algo/src/string/generate/RandomSubstringFactory.cpp b/alib2algo/src/string/generate/RandomSubstringFactory.cpp
index 68ad587a42..2e89b51746 100644
--- a/alib2algo/src/string/generate/RandomSubstringFactory.cpp
+++ b/alib2algo/src/string/generate/RandomSubstringFactory.cpp
@@ -17,17 +17,19 @@ namespace string {
namespace generate {
-string::LinearString RandomSubstringFactory::generateSubstring( size_t size, const string::LinearString & string) {
- if(size > string.getContent().size())
- throw exception::AlibException("String not long enough");
+string::LinearString RandomSubstringFactory::generateSubstring ( size_t size, const string::LinearString & string ) {
+ if ( size > string.getContent ( ).size ( ) )
+ throw exception::AlibException ( "String not long enough" );
- srand( time( NULL ) );
+ srand ( time ( NULL ) );
- size_t begin = std::random_devices::semirandom() % (string.getContent().size() - size + 1);
+ size_t begin = std::random_devices::semirandom ( ) % ( string.getContent ( ).size ( ) - size + 1 );
- std::vector<alphabet::Symbol> data(string.getContent().begin() + begin, string.getContent().begin() + begin + size);
+ std::vector < alphabet::Symbol > data ( string.getContent ( ).begin ( ) + begin, string.getContent ( ).begin ( ) + begin + size );
- return LinearString {string.getAlphabet(), data};
+ return LinearString {
+ string.getAlphabet ( ), data
+ };
}
auto RandomSubstringFactoryLinearString = RandomSubstringFactory::RegistratorWrapper < string::LinearString, string::LinearString > ( RandomSubstringFactory::getInstance ( ), RandomSubstringFactory::generateSubstring );
diff --git a/alib2algo/src/string/generate/RandomSubstringFactory.h b/alib2algo/src/string/generate/RandomSubstringFactory.h
index 95fa695b2f..182d1da35b 100644
--- a/alib2algo/src/string/generate/RandomSubstringFactory.h
+++ b/alib2algo/src/string/generate/RandomSubstringFactory.h
@@ -18,12 +18,14 @@ namespace generate {
class RandomSubstringFactory : public std::SingleDispatchFirstStaticParam < string::LinearString, size_t, string::StringBase > {
public:
- static string::LinearString generateSubstring( size_t size, const string::LinearString & );
+ static string::LinearString generateSubstring ( size_t size, const string::LinearString & );
- static RandomSubstringFactory& getInstance() {
+ static RandomSubstringFactory & getInstance ( ) {
static RandomSubstringFactory res;
+
return res;
}
+
};
} /* namespace generate */
--
GitLab