format code

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 ) );
-	if(alphabetSize > 26)
-		throw exception::AlibException("Too big alphabet.");
-	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);
-	return RandomStringFactory::generateLinearString( size, alphabet );
+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 <= 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 );
+
+	return RandomStringFactory::generateLinearString ( size, 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() <= 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;
-	for(size_t i = 0; i < size; i++) {
-		elems.push_back(alphabetList[std::random_devices::semirandom() % alphabetList.size()]);
-	}
-	return string::LinearString(elems);
+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 ( ) <= 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;
+	for ( size_t i = 0; i < size; i++ )
+		elems.push_back ( alphabetList[std::random_devices::semirandom ( ) % alphabetList.size ( )] );
+	return string::LinearString ( elems );
 }
 } /* namespace generate */

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 */

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");
-	srand( time( NULL ) );
-	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);
-	return LinearString {string.getAlphabet(), data};
+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 ) );
+	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 );
+	return LinearString {
+			   string.getAlphabet ( ), data
+	};
 }
 auto RandomSubstringFactoryLinearString = RandomSubstringFactory::RegistratorWrapper < string::LinearString, string::LinearString > ( RandomSubstringFactory::getInstance ( ), RandomSubstringFactory::generateSubstring );

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 RandomSubstringFactory& getInstance() {
+	static string::LinearString generateSubstring ( size_t size, const string::LinearString & );
+	static RandomSubstringFactory & getInstance ( ) {
 		static RandomSubstringFactory res;
+
 		return res;
 	}
+
 };
 } /* namespace generate */