diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h
index 782a8b2d961f7309b8e2c932af53bd6d9f295f69..fd33916deefeccd4bcf21091eceac87f742772d1 100644
--- a/alib2data/src/string/CyclicString.h
+++ b/alib2data/src/string/CyclicString.h
@@ -24,16 +24,17 @@
#ifndef CYCLIC_STRING_H_
#define CYCLIC_STRING_H_
+#include <sstream>
+
#include <alib/set>
#include <alib/vector>
-#include <sstream>
#include <alib/algorithm>
+#include <alib/compare>
#include <core/components.hpp>
#include <common/DefaultSymbolType.h>
-#include <string/StringBase.h>
#include <exception/CommonException.h>
#include <core/normalize.hpp>
@@ -60,7 +61,7 @@ class GeneralAlphabet;
* \tparam SymbolType used for the terminal alphabet
*/
template < class SymbolType = DefaultSymbolType >
-class CyclicString final : public StringBase, public core::Components < CyclicString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
+class CyclicString final : public ext::CompareOperators < CyclicString < SymbolType > >, public core::Components < CyclicString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
/**
* Representation of the string content.
*/
@@ -165,15 +166,6 @@ public:
*/
bool isEmpty ( ) const;
- /**
- * @copydoc base::CommonBase < StringBase >::compare ( const StringBase & )
- */
- virtual int compare ( const StringBase & other ) const override {
- if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
- return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
- }
-
/**
* The actual compare method
*
diff --git a/alib2data/src/string/Epsilon.h b/alib2data/src/string/Epsilon.h
index 0a50892aca10735e797a8c43df619b42d2e699b1..9b4141dc8ba22f8a1926a88f164f88c0a63a2973 100644
--- a/alib2data/src/string/Epsilon.h
+++ b/alib2data/src/string/Epsilon.h
@@ -26,12 +26,12 @@
#include <alib/set>
#include <alib/vector>
+#include <alib/compare>
#include <core/components.hpp>
#include <common/DefaultSymbolType.h>
-#include <string/StringBase.h>
#include <exception/CommonException.h>
#include <core/normalize.hpp>
@@ -56,12 +56,7 @@ class GeneralAlphabet;
* \tparam SymbolType used for the terminal alphabet
*/
template < class SymbolType = DefaultSymbolType >
-class Epsilon final : public StringBase, public core::Components < Epsilon < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
- /**
- * Representation of the epsilon content.
- */
- static const ext::vector < SymbolType > content;
-
+class Epsilon final : public ext::CompareOperators < Epsilon < SymbolType > >, public core::Components < Epsilon < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
public:
/**
* \brief Creates a new instance of the epsilon
@@ -102,27 +97,6 @@ public:
this->template accessComponent < GeneralAlphabet > ( ).add ( std::move ( symbols ) );
}
- /**
- * Getter of the string content.
- *
- * \return List of symbols forming string.
- */
- const ext::vector < SymbolType > & getContent ( ) const;
-
- /**
- * \return true
- */
- bool isEmpty ( ) const;
-
- /**
- * @copydoc base::CommonBase < StringBase >::compare ( const StringBase & )
- */
- virtual int compare ( const StringBase & other ) const override {
- if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
- return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
- }
-
/**
* The actual compare method
*
@@ -167,16 +141,6 @@ template < class SymbolType >
Epsilon < SymbolType >::Epsilon() : Epsilon ( ext::set< SymbolType > ( ) ) {
}
-template < class SymbolType >
-const ext::vector<SymbolType> & Epsilon < SymbolType >::getContent() const {
- return Epsilon::content;
-}
-
-template < class SymbolType >
-bool Epsilon < SymbolType >::isEmpty() const {
- return true;
-}
-
template < class SymbolType >
int Epsilon < SymbolType >::compare(const Epsilon& other) const {
static ext::compare<ext::set<SymbolType>> comp;
@@ -191,9 +155,6 @@ Epsilon < SymbolType >::operator std::string ( ) const {
template < class SymbolType >
Epsilon < SymbolType > Epsilon < SymbolType >::EPSILON = Epsilon < SymbolType >();
-template < class SymbolType >
-const ext::vector<SymbolType> Epsilon < SymbolType >::content;
-
} /* namespace string */
namespace core {
diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h
index 01fade1fbba58f7865b007bd85e93950f8d67bbf..535f15de2d15e11db65ee0f21b399bf522192911 100644
--- a/alib2data/src/string/LinearString.h
+++ b/alib2data/src/string/LinearString.h
@@ -24,16 +24,17 @@
#ifndef LINEAR_STRING_H_
#define LINEAR_STRING_H_
+#include <sstream>
+
#include <alib/set>
#include <alib/vector>
-#include <sstream>
#include <alib/algorithm>
+#include <alib/compare>
#include <core/components.hpp>
#include <common/DefaultSymbolType.h>
-#include <string/StringBase.h>
#include <exception/CommonException.h>
#include <core/normalize.hpp>
@@ -57,7 +58,7 @@ class GeneralAlphabet;
* \tparam SymbolType used for the terminal alphabet
*/
template < class SymbolType = DefaultSymbolType >
-class LinearString final : public StringBase, public core::Components < LinearString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
+class LinearString final : public ext::CompareOperators < LinearString < SymbolType > >, public core::Components < LinearString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet > {
/**
* Representation of the string content.
*/
@@ -169,15 +170,6 @@ public:
*/
bool isEmpty ( ) const;
- /**
- * @copydoc base::CommonBase < StringBase >::compare ( const StringBase & )
- */
- virtual int compare ( const StringBase & other ) const override {
- if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
- return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
- }
-
/**
* The actual compare method
*
diff --git a/alib2data/src/string/StringBase.h b/alib2data/src/string/StringBase.h
deleted file mode 100644
index 38ff7a6469974dc1e4b4db03a58ffccca1905a56..0000000000000000000000000000000000000000
--- a/alib2data/src/string/StringBase.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * StringBase.h
- *
- * This file is part of Algorithms library toolkit.
- * Copyright (C) 2017 Jan Travnicek (jan.travnicek@fit.cvut.cz)
-
- * Algorithms library toolkit is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * Algorithms library toolkit is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with Algorithms library toolkit. If not, see <http://www.gnu.org/licenses/>.
- *
- * Created on: Mar 26, 2013
- * Author: Jan Travnicek
- */
-
-#ifndef STRING_BASE_H_
-#define STRING_BASE_H_
-
-#include <alib/compare>
-
-namespace string {
-
-/**
- * \brief Represents base for a concrete string type.
- */
-class StringBase : public ext::CompareOperators < StringBase > {
-public:
- virtual ~StringBase ( ) noexcept {
- }
-
- /**
- * \brief Comparison helper method evaluating allowing possibly deeper comparison of this with other class of the same type.
- *
- * \details If the other class is of different type the relative order is computer by means of type_index.
- *
- * \param other the other class to compare with
- *
- * \returns result of actual comparison if type of this class and other class is the same, result of difference of type indexes othervise.
- */
- virtual int compare ( const StringBase & other ) const = 0;
-};
-
-} /* namespace string */
-
-#endif /* STRING_BASE_H_ */
diff --git a/alib2data/src/string/WildcardLinearString.h b/alib2data/src/string/WildcardLinearString.h
index 7f359bc0e91500d59b68c1e8618daa2b0062e58e..1e5ed7e92bc358bc9fc7b80341ac785f8b88919b 100644
--- a/alib2data/src/string/WildcardLinearString.h
+++ b/alib2data/src/string/WildcardLinearString.h
@@ -8,17 +8,18 @@
#ifndef WILDCARD_LINEAR_STRING_H_
#define WILDCARD_LINEAR_STRING_H_
+#include <sstream>
+
#include <alib/set>
#include <alib/vector>
-#include <sstream>
#include <alib/algorithm>
+#include <alib/compare>
#include <core/components.hpp>
#include <alphabet/WildcardSymbol.h>
#include <common/DefaultSymbolType.h>
-#include <string/StringBase.h>
#include <exception/CommonException.h>
#include <core/normalize.hpp>
@@ -44,7 +45,7 @@ class WildcardSymbol;
* \tparam SymbolType used for the terminal alphabet
*/
template < class SymbolType = DefaultSymbolType >
-class WildcardLinearString final : public StringBase, public core::Components < WildcardLinearString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet, SymbolType, component::Value, WildcardSymbol > {
+class WildcardLinearString final : public ext::CompareOperators < WildcardLinearString < SymbolType > >, public core::Components < WildcardLinearString < SymbolType >, ext::set < SymbolType >, component::Set, GeneralAlphabet, SymbolType, component::Value, WildcardSymbol > {
/**
* Representation of the string content.
*/
@@ -215,15 +216,6 @@ public:
*/
bool isEmpty ( ) const;
- /**
- * @copydoc base::CommonBase < StringBase >::compare ( const StringBase & )
- */
- virtual int compare ( const StringBase & other ) const override {
- if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
- return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
- }
-
/**
* The actual compare method
*
diff --git a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
index deef884e1b6a2c0453ba1e763db02fad20772a3f..a6a9bd88ad9876fc5d26243dcb5f9ffa56e442e4 100644
--- a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
+++ b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
@@ -12,8 +12,7 @@
#include <alib/set>
#include <alib/vector>
#include <alib/deque>
-
-#include <string/StringBase.h>
+#include <alib/compare>
#include <core/components.hpp>
@@ -31,7 +30,7 @@ class TerminatingSymbol;
* Represents regular expression parsed from the XML. Regular expression is stored
* as a tree of LinearStringElement.
*/
-class LinearStringTerminatingSymbol final : public StringBase, public core::Components < LinearStringTerminatingSymbol, ext::set < DefaultSymbolType >, component::Set, GeneralAlphabet, DefaultSymbolType, component::Value, TerminatingSymbol > {
+class LinearStringTerminatingSymbol final : public ext::CompareOperators < LinearStringTerminatingSymbol >, public core::Components < LinearStringTerminatingSymbol, ext::set < DefaultSymbolType >, component::Set, GeneralAlphabet, DefaultSymbolType, component::Value, TerminatingSymbol > {
ext::vector < DefaultSymbolType > m_Data;
public:
@@ -69,13 +68,7 @@ public:
*/
bool isEmpty ( ) const;
- virtual int compare ( const StringBase & other ) const {
- if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
- return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
- }
-
- virtual int compare ( const LinearStringTerminatingSymbol & other ) const;
+ int compare ( const LinearStringTerminatingSymbol & other ) const;
friend std::ostream & operator << ( std::ostream & out, const LinearStringTerminatingSymbol & instance );