diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h index 2cd9b23b4b76316da23a11922bb6eb9098727321..22dbd83350fd1d70b73ac45cb293387a190f752f 100644 --- a/alib2data/src/string/CyclicString.h +++ b/alib2data/src/string/CyclicString.h @@ -21,7 +21,6 @@ #include "StringFeatures.h" #include "common/StringFromXMLParser.h" #include "common/StringToXMLComposer.h" -#include "common/StringAuxiliary.h" #include <exception/CommonException.h> #include <alphabet/common/SymbolNormalize.h> @@ -122,7 +121,7 @@ CyclicString < SymbolType >::CyclicString(std::vector<SymbolType> str) : CyclicS } template < class SymbolType > -CyclicString < SymbolType >::CyclicString(const std::string& str) : CyclicString ( StringAuxiliary::toInternal ( str ) ) { +CyclicString < SymbolType >::CyclicString(const std::string& str) : CyclicString ( std::vector < SymbolType > ( str.begin ( ), str.end ( ) ) ) { } template < class SymbolType > diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h index 31d190498b3f52d212894c01e97007a04d74445e..6941131e9ee63547c9ae7ef0c65a5a769a655c0a 100644 --- a/alib2data/src/string/LinearString.h +++ b/alib2data/src/string/LinearString.h @@ -21,7 +21,6 @@ #include "StringFeatures.h" #include "common/StringFromXMLParser.h" #include "common/StringToXMLComposer.h" -#include "common/StringAuxiliary.h" #include <exception/CommonException.h> #include <alphabet/common/SymbolNormalize.h> @@ -150,7 +149,7 @@ LinearString < SymbolType >::LinearString(std::vector<SymbolType> str) : LinearS } template < class SymbolType > -LinearString < SymbolType >::LinearString(const std::string & str) : LinearString ( StringAuxiliary::toInternal ( str ) ) { +LinearString < SymbolType >::LinearString(const std::string & str) : LinearString ( std::vector < SymbolType > ( str.begin ( ), str.end ( ) ) ) { } template < class SymbolType > diff --git a/alib2data/src/string/common/StringAuxiliary.cpp b/alib2data/src/string/common/StringAuxiliary.cpp deleted file mode 100644 index e368bf5fa4e680f9ad02c3d160481fe5a2c89caf..0000000000000000000000000000000000000000 --- a/alib2data/src/string/common/StringAuxiliary.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * StringAuxiliary.cpp - * - * Created on: May 7, 2016 - * Author: Jan Travnicek - */ - -#include "StringAuxiliary.h" - -namespace string { - -std::vector < DefaultSymbolType > StringAuxiliary::toInternal ( const std::string & rawString ) { - std::vector < DefaultSymbolType > data; - for ( const char& symbol : rawString ) { - data.push_back( DefaultSymbolType ( symbol ) ); - } - return data; -} - -} /* namespace string */ diff --git a/alib2data/src/string/common/StringAuxiliary.h b/alib2data/src/string/common/StringAuxiliary.h deleted file mode 100644 index c72fae1c053e52e56334e6e3f06f1185efb90ae7..0000000000000000000000000000000000000000 --- a/alib2data/src/string/common/StringAuxiliary.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * StringAuxiliary.h - * - * Created on: May 7, 2016 - * Author: Jan Travnicek - */ - -#ifndef STRING_AUXILIARY_H_ -#define STRING_AUXILIARY_H_ - -#include <set> -#include <vector> -#include <common/DefaultSymbolType.h> - -namespace string { - -/** - * Parser used to get string from XML parsed into list of Tokens. - */ -class StringAuxiliary { -public: - static std::vector < DefaultSymbolType > toInternal ( const std::string & rawString ); -}; - -} /* namespace string */ - -#endif /* STRING_AUXILIARY_H_ */