diff --git a/alib2data/src/alphabet/BarSymbol.cpp b/alib2data/src/alphabet/BarSymbol.cpp
index 03aeee92a693614c3328ee33f2224d908c7ac309..0b4f3017bedc203ea2cad75a8d68ff3202325769 100644
--- a/alib2data/src/alphabet/BarSymbol.cpp
+++ b/alib2data/src/alphabet/BarSymbol.cpp
@@ -21,10 +21,6 @@ SymbolBase* BarSymbol::plunder() && {
return new BarSymbol(std::move(*this));
}
-int BarSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int BarSymbol::compare(const BarSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/BarSymbol.h b/alib2data/src/alphabet/BarSymbol.h
index 8c0a0504d4e1dd8cc4bd2f967e8c7da2bf5e64c9..4e8daaaf62e781bb480dfd2f29bd80c6dcb84c00 100644
--- a/alib2data/src/alphabet/BarSymbol.h
+++ b/alib2data/src/alphabet/BarSymbol.h
@@ -26,7 +26,10 @@ public:
virtual SymbolBase* clone() const;
virtual SymbolBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const BarSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/BlankSymbol.cpp b/alib2data/src/alphabet/BlankSymbol.cpp
index 6217ac0c8e6488eb2c98bea36e126c41e408c623..93dfb7f02b25cb5b10564149d8efb45834e78888 100644
--- a/alib2data/src/alphabet/BlankSymbol.cpp
+++ b/alib2data/src/alphabet/BlankSymbol.cpp
@@ -21,10 +21,6 @@ SymbolBase* BlankSymbol::plunder() && {
return new BlankSymbol(std::move(*this));
}
-int BlankSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int BlankSymbol::compare(const BlankSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/BlankSymbol.h b/alib2data/src/alphabet/BlankSymbol.h
index 29d0a20a094f02d91f8cddab2d911388edef6709..bf7f2d1312b68e8f5e3ca8a8c254b69e5a812a2e 100644
--- a/alib2data/src/alphabet/BlankSymbol.h
+++ b/alib2data/src/alphabet/BlankSymbol.h
@@ -26,7 +26,10 @@ public:
virtual SymbolBase* clone() const;
virtual SymbolBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const BlankSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp b/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
index f20bbf187dfc51a960e0ee97af422620de9083aa..99b9301144eefe6d44a9381b464f18ebf0971a51 100644
--- a/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
+++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
@@ -21,10 +21,6 @@ SymbolBase* BottomOfTheStackSymbol::plunder() && {
return new BottomOfTheStackSymbol(std::move(*this));
}
-int BottomOfTheStackSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int BottomOfTheStackSymbol::compare(const BottomOfTheStackSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.h b/alib2data/src/alphabet/BottomOfTheStackSymbol.h
index af7f4c569a3834f7d3f81b5bc82c227f772d9749..99abe4f709b7fa26916ff01ab20da31c01c2bcd8 100644
--- a/alib2data/src/alphabet/BottomOfTheStackSymbol.h
+++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.h
@@ -26,7 +26,10 @@ public:
virtual SymbolBase* clone() const;
virtual SymbolBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const BottomOfTheStackSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/EndSymbol.cpp b/alib2data/src/alphabet/EndSymbol.cpp
index 958950ee5900838437c8ecd2f7998b55f17193db..6beea7a6848052a90e9b3f935f30868186ede82f 100644
--- a/alib2data/src/alphabet/EndSymbol.cpp
+++ b/alib2data/src/alphabet/EndSymbol.cpp
@@ -21,10 +21,6 @@ SymbolBase* EndSymbol::plunder() && {
return new EndSymbol(std::move(*this));
}
-int EndSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int EndSymbol::compare(const EndSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/EndSymbol.h b/alib2data/src/alphabet/EndSymbol.h
index 476e864e807ccef42230e6c65cf47b9f31efdb2e..50a735a32472fb9bdb29999aa7805759aa245448 100644
--- a/alib2data/src/alphabet/EndSymbol.h
+++ b/alib2data/src/alphabet/EndSymbol.h
@@ -26,7 +26,10 @@ public:
virtual SymbolBase* clone() const;
virtual SymbolBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const EndSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/LabeledSymbol.cpp b/alib2data/src/alphabet/LabeledSymbol.cpp
index 8bb3cee5d055fee96f01cfd2336e21b1b46e135a..ddc46cc9e93555b2b625832650e9f386fcbc0d08 100644
--- a/alib2data/src/alphabet/LabeledSymbol.cpp
+++ b/alib2data/src/alphabet/LabeledSymbol.cpp
@@ -41,10 +41,6 @@ const label::Label& LabeledSymbol::getLabel() const {
return label;
}
-int LabeledSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LabeledSymbol::compare(const LabeledSymbol& other) const {
return this->label.getData().compare(other.label.getData());
}
diff --git a/alib2data/src/alphabet/LabeledSymbol.h b/alib2data/src/alphabet/LabeledSymbol.h
index 528bb40dd0051a7adffd94a25634e6357d971952..9e8192ed099df861b1e46467a21bd33e9ca98fed 100644
--- a/alib2data/src/alphabet/LabeledSymbol.h
+++ b/alib2data/src/alphabet/LabeledSymbol.h
@@ -41,7 +41,10 @@ public:
*/
const label::Label& getLabel() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const LabeledSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/RankedBarSymbol.cpp b/alib2data/src/alphabet/RankedBarSymbol.cpp
index 9fbee197e023c1f59aaf7045acff464f2214a7c3..b9ad90876bed298506c8273a5b557c3bc6595505 100644
--- a/alib2data/src/alphabet/RankedBarSymbol.cpp
+++ b/alib2data/src/alphabet/RankedBarSymbol.cpp
@@ -29,10 +29,6 @@ const primitive::Integer& RankedBarSymbol::getRank() const {
return rank;
}
-int RankedBarSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RankedBarSymbol::compare(const RankedBarSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/RankedBarSymbol.h b/alib2data/src/alphabet/RankedBarSymbol.h
index ca40d8622e2bcbdb023274a58ee24cf5dedd1a2c..bbd6fa8acddf5870b680ca788348376d86fc239e 100644
--- a/alib2data/src/alphabet/RankedBarSymbol.h
+++ b/alib2data/src/alphabet/RankedBarSymbol.h
@@ -34,7 +34,10 @@ public:
*/
const primitive::Integer& getRank() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RankedBarSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/RankedSymbol.cpp b/alib2data/src/alphabet/RankedSymbol.cpp
index 5b09ee5b641b8622214e08b3f268b50b814cdd2e..32eee892522e03fe076dcae7fbe8bae1e2861896 100644
--- a/alib2data/src/alphabet/RankedSymbol.cpp
+++ b/alib2data/src/alphabet/RankedSymbol.cpp
@@ -45,10 +45,6 @@ const primitive::Integer& RankedSymbol::getRank() const {
return rank;
}
-int RankedSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RankedSymbol::compare(const RankedSymbol& other) const {
int res = this->label.getData().compare(other.label.getData());
if(res == 0) res = this->rank.compare(other.rank);
diff --git a/alib2data/src/alphabet/RankedSymbol.h b/alib2data/src/alphabet/RankedSymbol.h
index 9f1ad0d3aae74364b8c0f53df98fed4303a3c61b..0b4d86a0aba1acb2349d8e2fb77e1a8133478eb0 100644
--- a/alib2data/src/alphabet/RankedSymbol.h
+++ b/alib2data/src/alphabet/RankedSymbol.h
@@ -49,7 +49,10 @@ public:
*/
const primitive::Integer& getRank() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RankedSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp b/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
index 908adc43c024588dd6a605550b0f93e1ca7979f1..adf069bb6c9e9d920fb927439c0b55b1002f341b 100644
--- a/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
+++ b/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
@@ -21,10 +21,6 @@ SymbolBase* SubtreeWildcardSymbol::plunder() && {
return new SubtreeWildcardSymbol(std::move(*this));
}
-int SubtreeWildcardSymbol::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int SubtreeWildcardSymbol::compare(const SubtreeWildcardSymbol&) const {
return 0;
}
diff --git a/alib2data/src/alphabet/SubtreeWildcardSymbol.h b/alib2data/src/alphabet/SubtreeWildcardSymbol.h
index 5a8e9c31c7a0e7131b4cab8e17ef087e9c3f4f87..6c1480a898a46bddc32b65de9d42f5db18892a95 100644
--- a/alib2data/src/alphabet/SubtreeWildcardSymbol.h
+++ b/alib2data/src/alphabet/SubtreeWildcardSymbol.h
@@ -26,7 +26,10 @@ public:
virtual SymbolBase* clone() const;
virtual SymbolBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const SubtreeWildcardSymbol& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp
index fa9ba83f73528742bfcba5c37b0ef4dfed4a2fcb..16d53007a871cbbb5b1a0e094d946609088a6559 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.cpp
+++ b/alib2data/src/automaton/FSM/CompactNFA.cpp
@@ -164,10 +164,6 @@ std::map<std::pair<State, string::LinearString>, std::set<State>> CompactNFA::ge
return transitionsToState;
}
-int CompactNFA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int CompactNFA::compare(const CompactNFA& other) const {
std::compare<decltype(states)> comp;
int res = comp(states, other.states);
diff --git a/alib2data/src/automaton/FSM/CompactNFA.h b/alib2data/src/automaton/FSM/CompactNFA.h
index 0c7284a17e5f6cf30a96638c81d63355dcbc94ed..26c8e8be07e290c12967946c0372e945cfcb096b 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.h
+++ b/alib2data/src/automaton/FSM/CompactNFA.h
@@ -79,7 +79,10 @@ public:
*/
std::map<std::pair<State, string::LinearString>, std::set<State>> getTransitionsToState(const State& from) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const CompactNFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/FSM/DFA.cpp b/alib2data/src/automaton/FSM/DFA.cpp
index 1c8c5e17066c94c1c818948668e0b03fc92614e9..ec5169eedaccea3d45258bdc3f1652448d8124e9 100644
--- a/alib2data/src/automaton/FSM/DFA.cpp
+++ b/alib2data/src/automaton/FSM/DFA.cpp
@@ -132,10 +132,6 @@ bool DFA::isTotal() const {
return transitions.size() == inputAlphabet.size() * states.size();
}
-int DFA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int DFA::compare(const DFA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/FSM/DFA.h b/alib2data/src/automaton/FSM/DFA.h
index 1fb39a450cb13c588ed953f379f9682556645138..b0552f6d68752e4c7090e1f103314c03cb21d2ee 100644
--- a/alib2data/src/automaton/FSM/DFA.h
+++ b/alib2data/src/automaton/FSM/DFA.h
@@ -80,7 +80,10 @@ public:
*/
bool isTotal() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const DFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
index 99ebddec3225069aaa37495179dd9478e5fbef87..c053207f2272d7a16ed01759d7f3347de36c6fea 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
@@ -265,10 +265,6 @@ bool EpsilonNFA::isTotal() const {
return isDeterministic() && transitions.size() == inputAlphabet.size() * states.size();
}
-int EpsilonNFA::compare(const ObjectBase& other) const {
- return other.compare(*this);
-}
-
int EpsilonNFA::compare(const EpsilonNFA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.h b/alib2data/src/automaton/FSM/EpsilonNFA.h
index 479b739d6b70685304af0a278009b44cb41b118a..28fad8d46e824e98f790fc9a984c088b128f0ef3 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.h
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.h
@@ -158,7 +158,10 @@ public:
*/
bool isTotal() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const EpsilonNFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
index 9e9a7a42017f9c237283b6af9397602a5a5132ec..663920663a37efd73da99f2c3df1f5cd5fecf2a2 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
@@ -176,10 +176,6 @@ std::map<std::pair<State, regexp::RegExp>, std::set<State> > ExtendedNFA::getTra
return transitionsToState;
}
-int ExtendedNFA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ExtendedNFA::compare(const ExtendedNFA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.h b/alib2data/src/automaton/FSM/ExtendedNFA.h
index 2f01c40289809822ab0d376c912efcd153638649..16fd38b603b01004c13beedec1791ffa59b6b702 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.h
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.h
@@ -81,7 +81,10 @@ public:
*/
std::map<std::pair<State, regexp::RegExp>, std::set<State> > getTransitionsToState(const State& from) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ExtendedNFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
index 368272c2aca2b8be5f6883f3909ba63f4d1d581f..fbe13322e8cb40d3f0cf3b59f356a1452ff5f275 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
@@ -155,10 +155,6 @@ unsigned MultiInitialStateNFA::transitionsSize() const {
return res;
}
-int MultiInitialStateNFA::compare(const ObjectBase& other) const {
- return other.compare(*this);
-}
-
int MultiInitialStateNFA::compare(const MultiInitialStateNFA& other) const {
auto first = std::tie(states, inputAlphabet, initialStates, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialStates, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
index 82192f4e7381675041d5b33123dc3ef29b5972d4..48bda23aa7bff6ea055df511d52b6ceb11f69f76 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
@@ -97,7 +97,10 @@ public:
unsigned transitionsSize() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const MultiInitialStateNFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/FSM/NFA.cpp b/alib2data/src/automaton/FSM/NFA.cpp
index 510bf9c92d8fee6462281cd255620634505787cf..72ee67a7facba93aafdec6ef2e3dd4a869984a21 100644
--- a/alib2data/src/automaton/FSM/NFA.cpp
+++ b/alib2data/src/automaton/FSM/NFA.cpp
@@ -138,10 +138,6 @@ unsigned NFA::transitionsSize() const {
return res;
}
-int NFA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int NFA::compare(const NFA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/FSM/NFA.h b/alib2data/src/automaton/FSM/NFA.h
index 3fb615aed188ba8ea92f37ba9eb9ca0c2fade2be..3d4bad88ec3ac086b75e929b0455dd7b1babf716 100644
--- a/alib2data/src/automaton/FSM/NFA.h
+++ b/alib2data/src/automaton/FSM/NFA.h
@@ -95,7 +95,10 @@ public:
unsigned transitionsSize() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const NFA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp
index 9db8052048413675a2b2af8e18785844ad01f677..85bd138fe4e22d020d7911c0fa93854215ff31b7 100644
--- a/alib2data/src/automaton/PDA/DPDA.cpp
+++ b/alib2data/src/automaton/PDA/DPDA.cpp
@@ -222,10 +222,6 @@ std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, std:
return transitionsToState;
}
-int DPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int DPDA::compare(const DPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, stackAlphabet, initialSymbol, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.stackAlphabet, other.initialSymbol, other.transitions);
diff --git a/alib2data/src/automaton/PDA/DPDA.h b/alib2data/src/automaton/PDA/DPDA.h
index e5a8eafbc75925c805e581844180cebb2be0a1bf..92d0465b9fb96ece037c165c879b50fe5d288973 100644
--- a/alib2data/src/automaton/PDA/DPDA.h
+++ b/alib2data/src/automaton/PDA/DPDA.h
@@ -91,7 +91,10 @@ public:
*/
std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, std::vector<alphabet::Symbol> >, std::pair<State, std::vector<alphabet::Symbol> > > getTransitionsToState(const State& from) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const DPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
index c91056b197fc61497c97fb665cc7c045f323c03a..c6fa402b502d1155e6fa5b4e76a0856622369644 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
@@ -174,10 +174,6 @@ bool InputDrivenNPDA::isDeterministic() const {
return true;
}
-int InputDrivenNPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int InputDrivenNPDA::compare(const InputDrivenNPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialStates, finalStates, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialStates, other.finalStates, other.transitions);
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.h b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
index b841f4c819c7e47de53841b3dd72fcb45481e1b8..d07ea51e14a6caa2c3f54a7468bf7a484641a72e 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.h
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
@@ -88,7 +88,10 @@ public:
*/
bool isDeterministic() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const InputDrivenNPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp
index c546b60c815fd1237885a69a99e4736f85be9d87..5407aaaed8f383459325dfe14df9fa5c54b356ae 100644
--- a/alib2data/src/automaton/PDA/NPDA.cpp
+++ b/alib2data/src/automaton/PDA/NPDA.cpp
@@ -133,10 +133,6 @@ const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>
return transitions;
}
-int NPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int NPDA::compare(const NPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialStates, finalStates, stackAlphabet, initialSymbols, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialStates, other.finalStates, other.stackAlphabet, other.initialSymbols, other.transitions);
diff --git a/alib2data/src/automaton/PDA/NPDA.h b/alib2data/src/automaton/PDA/NPDA.h
index f0148973096808d0126e73bb9c87e661df0bceb6..77631a27c0ac07459fb9b8ae3012f03aa1869cfd 100644
--- a/alib2data/src/automaton/PDA/NPDA.h
+++ b/alib2data/src/automaton/PDA/NPDA.h
@@ -75,7 +75,10 @@ public:
*/
const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, std::vector<alphabet::Symbol> >, std::set<std::pair<State, std::vector<alphabet::Symbol> > > >& getTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const NPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
index fe7b406fdc5d09485f39df185246dfd196c158c7..0b44a8fafba36597dd97bd62d9eebb74b9764ab7 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
@@ -366,10 +366,6 @@ const std::map<std::pair<State, std::variant<string::Epsilon, alphabet::Symbol>>
return localTransitions;
}
-int RealTimeHeightDeterministicDPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RealTimeHeightDeterministicDPDA::compare(const RealTimeHeightDeterministicDPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, stackAlphabet, bottomOfTheStackSymbol, callTransitions, returnTransitions, localTransitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.stackAlphabet, other.bottomOfTheStackSymbol, other.callTransitions, other.returnTransitions, other.localTransitions);
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
index b27b051b7a9c4978c3666678a10ad72df4c33587..64e9ea3ccd6416b5bfe16441aae5b0fdec8afbac 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
@@ -118,7 +118,10 @@ public:
const std::map<std::pair<State, std::variant<string::Epsilon, alphabet::Symbol>>, State>& getLocalTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RealTimeHeightDeterministicDPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
index 4f1ee73d7c7108b7d5bd99679eae481d0680118a..8a5f75eade5208ac33074e615f7bdd2bbaef2206 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
@@ -257,10 +257,6 @@ const std::map<std::pair<State, std::variant<string::Epsilon, alphabet::Symbol>>
return localTransitions;
}
-int RealTimeHeightDeterministicNPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RealTimeHeightDeterministicNPDA::compare(const RealTimeHeightDeterministicNPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialStates, finalStates, stackAlphabet, bottomOfTheStackSymbol, callTransitions, returnTransitions, localTransitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialStates, other.finalStates, other.stackAlphabet, other.bottomOfTheStackSymbol, other.callTransitions, other.returnTransitions, other.localTransitions);
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
index 165381a83c584a6b1073ad22d932570e9576b576..21e85c58d4f9100c5d2e4f1ce22ad824654eb110 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
@@ -118,7 +118,10 @@ public:
const std::map<std::pair<State, std::variant<string::Epsilon, alphabet::Symbol>>, std::set<State> >& getLocalTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RealTimeHeightDeterministicNPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
index e46690da38904ba9a8991c9c98421338899f20f6..be45694060c524a2efbc198f3590c263ec058b90 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
@@ -168,10 +168,6 @@ const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>
return transitions;
}
-int SinglePopDPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int SinglePopDPDA::compare(const SinglePopDPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, stackAlphabet, initialSymbol, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.stackAlphabet, other.initialSymbol, other.transitions);
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.h b/alib2data/src/automaton/PDA/SinglePopDPDA.h
index 7b100c775d6b519c23b99fe3585b029e8fc6a553..3ac5eca2d403e7ad1ca7391b3f59b35d218a150f 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.h
@@ -81,7 +81,10 @@ public:
*/
const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, alphabet::Symbol>, std::pair<State, std::vector<alphabet::Symbol> > >& getTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const SinglePopDPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
index e8c41744c035b842515b1aed6d123396b963a0b4..b4040aa83a07c027ccced1f2194d670394878eec 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
@@ -129,10 +129,6 @@ const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>
return transitions;
}
-int SinglePopNPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int SinglePopNPDA::compare(const SinglePopNPDA& other) const {
auto first = std::tie(states, inputAlphabet, initialStates, finalStates, stackAlphabet, initialSymbols, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialStates, other.finalStates, other.stackAlphabet, other.initialSymbols, other.transitions);
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.h b/alib2data/src/automaton/PDA/SinglePopNPDA.h
index 43b833db66bafd35e3cabe54de8b0eac5c9d86ab..84ddfe56761c8d2f0de196b38bf643613255d59d 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.h
@@ -75,7 +75,10 @@ public:
*/
const std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, alphabet::Symbol>, std::set<std::pair<State, std::vector<alphabet::Symbol> > > >& getTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const SinglePopNPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
index 34228a06661a97406001c67053bb5b81c7ba5d9a..ec13165a9e949698535b2b1ef10ae8a92475ed22 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
@@ -264,10 +264,6 @@ const std::map<std::pair<State, alphabet::Symbol>, State>& VisiblyPushdownDPDA::
return localTransitions;
}
-int VisiblyPushdownDPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int VisiblyPushdownDPDA::compare(const VisiblyPushdownDPDA& other) const {
auto first = std::tie(states, callInputAlphabet, returnInputAlphabet, localInputAlphabet, initialState, finalStates, stackAlphabet, bottomOfTheStackSymbol, callTransitions, returnTransitions, localTransitions);
auto second = std::tie(other.states, other.callInputAlphabet, other.returnInputAlphabet, other.localInputAlphabet, other.initialState, other.finalStates, other.stackAlphabet, other.bottomOfTheStackSymbol, other.callTransitions, other.returnTransitions, other.localTransitions);
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
index f44bf960fa8ea734871cc048114b30c400a15a23..0aa8958edbf3c5646ddf0b2fa09bf3213b2041b8 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
@@ -104,7 +104,10 @@ public:
const std::map<std::pair<State, alphabet::Symbol>, State>& getLocalTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const VisiblyPushdownDPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
index bb270a28e7bffc4b7d2cd83727fade384cdb1a07..b953fedbbb635828b09a90d01fb08ad4483137db 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
@@ -197,10 +197,6 @@ const std::map<std::pair<State, alphabet::Symbol>, std::set<State> >& VisiblyPus
return localTransitions;
}
-int VisiblyPushdownNPDA::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int VisiblyPushdownNPDA::compare(const VisiblyPushdownNPDA& other) const {
auto first = std::tie(states, callInputAlphabet, returnInputAlphabet, localInputAlphabet, initialStates, finalStates, stackAlphabet, bottomOfTheStackSymbol, callTransitions, returnTransitions, localTransitions);
auto second = std::tie(other.states, other.callInputAlphabet, other.returnInputAlphabet, other.localInputAlphabet, other.initialStates, other.finalStates, other.stackAlphabet, other.bottomOfTheStackSymbol, other.callTransitions, other.returnTransitions, other.localTransitions);
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
index 6aa153fe96da5175fbabc01f82f82074d1058716..3f22b8c4d26201dd327573ef52703ae415543b13 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
@@ -104,7 +104,10 @@ public:
const std::map<std::pair<State, alphabet::Symbol>, std::set<State> >& getLocalTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const VisiblyPushdownNPDA& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/automaton/TM/OneTapeDTM.cpp b/alib2data/src/automaton/TM/OneTapeDTM.cpp
index 9951f1f2c3a7e379be28ff24010783d7996cabc5..45497fff249793c4dbf81b3b1320b5e13b153764 100644
--- a/alib2data/src/automaton/TM/OneTapeDTM.cpp
+++ b/alib2data/src/automaton/TM/OneTapeDTM.cpp
@@ -114,10 +114,6 @@ const std::map<std::pair<State, alphabet::Symbol>, std::tuple<State, alphabet::S
return transitions;
}
-int OneTapeDTM::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int OneTapeDTM::compare(const OneTapeDTM& other) const {
auto first = std::tie(states, inputAlphabet, initialState, finalStates, tapeAlphabet, blankSymbol, transitions);
auto second = std::tie(other.states, other.inputAlphabet, other.initialState, other.finalStates, other.tapeAlphabet, other.blankSymbol, other.transitions);
diff --git a/alib2data/src/automaton/TM/OneTapeDTM.h b/alib2data/src/automaton/TM/OneTapeDTM.h
index c2590e3da0ce4005371ee6b9167a49aa5a602c1b..0418689019f1d084bfeb79c032f847b0a7a78fde 100644
--- a/alib2data/src/automaton/TM/OneTapeDTM.h
+++ b/alib2data/src/automaton/TM/OneTapeDTM.h
@@ -73,7 +73,10 @@ public:
*/
const std::map<std::pair<State, alphabet::Symbol>, std::tuple<State, alphabet::Symbol, Shift> >& getTransitions() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const OneTapeDTM& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/container/ObjectsMap.cpp b/alib2data/src/container/ObjectsMap.cpp
index 9dfc2156b5ac10225fd5af6c5269dda4f0f9d214..93f99f10ccd6fbaa63ebe3400b1458a4884522cd 100644
--- a/alib2data/src/container/ObjectsMap.cpp
+++ b/alib2data/src/container/ObjectsMap.cpp
@@ -22,10 +22,6 @@ ContainerBase* ObjectsMap::plunder() && {
return new ObjectsMap(std::move(*this));
}
-int ObjectsMap::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ObjectsMap::compare(const ObjectsMap& other) const {
if(static_cast<const std::map<alib::Object, alib::Object>>(*this) == static_cast<const std::map<alib::Object, alib::Object>>(other)) {
return 0;
diff --git a/alib2data/src/container/ObjectsMap.h b/alib2data/src/container/ObjectsMap.h
index 75864401db05aabfe735735d650313e753a90b76..de194f09378c727f08bf949f395c01650f85a91b 100644
--- a/alib2data/src/container/ObjectsMap.h
+++ b/alib2data/src/container/ObjectsMap.h
@@ -26,7 +26,10 @@ public:
virtual ContainerBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ObjectsMap& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/container/ObjectsPair.cpp b/alib2data/src/container/ObjectsPair.cpp
index b44b02887eae6adcb16dff5ee2f6f5d41aee6575..dc7efab163e5116fbc6ac82ef4169258c770ba60 100644
--- a/alib2data/src/container/ObjectsPair.cpp
+++ b/alib2data/src/container/ObjectsPair.cpp
@@ -26,10 +26,6 @@ ContainerBase* ObjectsPair::plunder() && {
return new ObjectsPair(std::move(*this));
}
-int ObjectsPair::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ObjectsPair::compare(const ObjectsPair& other) const {
if(static_cast<const std::pair<alib::Object, alib::Object>>(*this) == static_cast<const std::pair<alib::Object, alib::Object>>(other)) {
return 0;
diff --git a/alib2data/src/container/ObjectsPair.h b/alib2data/src/container/ObjectsPair.h
index 65651ce1c30fcb6426269bd83467047d275cd7a3..28bd4a12895ac6d7397409bfa50660d299dbd37e 100644
--- a/alib2data/src/container/ObjectsPair.h
+++ b/alib2data/src/container/ObjectsPair.h
@@ -28,7 +28,10 @@ public:
virtual ContainerBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ObjectsPair& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/container/ObjectsSet.cpp b/alib2data/src/container/ObjectsSet.cpp
index 464e69e8623a105206815b66dc1cc061da003ebe..b68e4811e953dcdc530dc996144ebb050cf93d5f 100644
--- a/alib2data/src/container/ObjectsSet.cpp
+++ b/alib2data/src/container/ObjectsSet.cpp
@@ -22,10 +22,6 @@ ContainerBase* ObjectsSet::plunder() && {
return new ObjectsSet(std::move(*this));
}
-int ObjectsSet::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ObjectsSet::compare(const ObjectsSet& other) const {
if(static_cast<const std::set<alib::Object>>(*this) == static_cast<const std::set<alib::Object>>(other)) {
return 0;
diff --git a/alib2data/src/container/ObjectsSet.h b/alib2data/src/container/ObjectsSet.h
index c704bc77c1b6cf79b8584d361c43cdbe055bb904..4ee7de42c8a712a0bb00693901fa34ddf18d59d5 100644
--- a/alib2data/src/container/ObjectsSet.h
+++ b/alib2data/src/container/ObjectsSet.h
@@ -26,7 +26,10 @@ public:
virtual ContainerBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ObjectsSet& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/container/ObjectsVector.cpp b/alib2data/src/container/ObjectsVector.cpp
index 9efb9292c990f9c7a8eef3ef89fc337c4bccd590..9f02aa8cd2ce921ce926a0958b7b97fe79bb7fcb 100644
--- a/alib2data/src/container/ObjectsVector.cpp
+++ b/alib2data/src/container/ObjectsVector.cpp
@@ -22,10 +22,6 @@ ContainerBase* ObjectsVector::plunder() && {
return new ObjectsVector(std::move(*this));
}
-int ObjectsVector::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ObjectsVector::compare(const ObjectsVector& other) const {
if(static_cast<const std::vector<alib::Object>>(*this) == static_cast<const std::vector<alib::Object>>(other)) {
return 0;
diff --git a/alib2data/src/container/ObjectsVector.h b/alib2data/src/container/ObjectsVector.h
index 7d372d2383703e639d2cae4c32911a3289e64a39..ca64be8673a30860a7ab2e0c938eba933e18398c 100644
--- a/alib2data/src/container/ObjectsVector.h
+++ b/alib2data/src/container/ObjectsVector.h
@@ -26,7 +26,10 @@ public:
virtual ContainerBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ObjectsVector& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/exception/AlibException.cpp b/alib2data/src/exception/AlibException.cpp
index 5373bb86b99ff568c0be4e9a7a68abc362d08123..573c7a1efeef581747e6c58bf9a00e9bf946c02d 100644
--- a/alib2data/src/exception/AlibException.cpp
+++ b/alib2data/src/exception/AlibException.cpp
@@ -67,10 +67,6 @@ const std::string & AlibException::getBacktrace ( ) const {
return backtrace;
}
-int AlibException::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int AlibException::compare(const AlibException& other) const {
return this->whatMessage.compare(other.whatMessage);
}
diff --git a/alib2data/src/exception/AlibException.h b/alib2data/src/exception/AlibException.h
index f68892c08f0726702fba0f49985bccbd4cca2983..7feee65081eefeba4bbfb31adf549dde44001881 100644
--- a/alib2data/src/exception/AlibException.h
+++ b/alib2data/src/exception/AlibException.h
@@ -53,7 +53,10 @@ public:
*/
const std::string & getBacktrace ( ) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const AlibException& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp
index bab73c29f256eda3f838f68f15e1beb7779c5810..90cb0f31f4b01e211c82e7806d1fc46a4fdf85de 100644
--- a/alib2data/src/grammar/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/ContextFree/CFG.cpp
@@ -89,10 +89,6 @@ bool CFG::removeRule(const alphabet::Symbol& leftHandSide, const std::vector<alp
return rules[leftHandSide].erase(rightHandSide);
}
-int CFG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int CFG::compare(const CFG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextFree/CFG.h b/alib2data/src/grammar/ContextFree/CFG.h
index 720f5f89a3c5affb9888e51694a11d92202a58d1..f995b96a6a237033713ed1988312de1f7628438b 100644
--- a/alib2data/src/grammar/ContextFree/CFG.h
+++ b/alib2data/src/grammar/ContextFree/CFG.h
@@ -47,7 +47,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const CFG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp
index 449f53d362fe5af195be0212bc6f8d883f9287db..ade7d480bf77a590da72fab3a040bd3954486a30 100644
--- a/alib2data/src/grammar/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/ContextFree/CNF.cpp
@@ -171,10 +171,6 @@ bool CNF::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int CNF::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int CNF::compare(const CNF& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextFree/CNF.h b/alib2data/src/grammar/ContextFree/CNF.h
index eca8d06616c3334953ef44bae7713ab059ca67a8..5e1ddfa9333f584ca1128a50de04b4a7829af9b2 100644
--- a/alib2data/src/grammar/ContextFree/CNF.h
+++ b/alib2data/src/grammar/ContextFree/CNF.h
@@ -56,7 +56,10 @@ public:
void setGeneratesEpsilon(bool genEps);
bool getGeneratesEpsilon() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const CNF& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
index 9a9c80c5078ab88eec63e66337f63d051e2a3409..7263e408090eef80d12f7c2ed537123262d50fce 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
@@ -122,10 +122,6 @@ bool EpsilonFreeCFG::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int EpsilonFreeCFG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int EpsilonFreeCFG::compare(const EpsilonFreeCFG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
index 1f07c6f2bd7e240d5b08d109f9442a4afdb3d9ee..a5382fadb1b62c0d57f192f57a579b3a50340cda 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
@@ -51,7 +51,10 @@ public:
void setGeneratesEpsilon(bool genEps);
bool getGeneratesEpsilon() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const EpsilonFreeCFG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp
index 93f6b393db635057fff9f5edd0c68883492376fe..82a875195680e33004d4c7312a71bd7428df34b4 100644
--- a/alib2data/src/grammar/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/ContextFree/GNF.cpp
@@ -130,10 +130,6 @@ bool GNF::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int GNF::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int GNF::compare(const GNF& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextFree/GNF.h b/alib2data/src/grammar/ContextFree/GNF.h
index da0fa45949aa555e3b57bde16a058782e801e72b..08b12ff8a65a63e04ec41a063c3d92db568ae440 100644
--- a/alib2data/src/grammar/ContextFree/GNF.h
+++ b/alib2data/src/grammar/ContextFree/GNF.h
@@ -48,9 +48,13 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
void setGeneratesEpsilon(bool genEps);
+
bool getGeneratesEpsilon() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const GNF& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp
index 03a2b0336f3322761a069ce452c9e30262ebe927..afbdb2816aabca8e83609101bd13bf0842ddd6c3 100644
--- a/alib2data/src/grammar/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/ContextFree/LG.cpp
@@ -180,10 +180,6 @@ bool LG::removeRawRule(const alphabet::Symbol& leftHandSide, const std::vector<a
}
}
-int LG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LG::compare(const LG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextFree/LG.h b/alib2data/src/grammar/ContextFree/LG.h
index 5e7a233d7cf5b2f0e710d8a497c8730898b8a305..322bac4bec052c8eed9fee578cde2539d7cb45c3 100644
--- a/alib2data/src/grammar/ContextFree/LG.h
+++ b/alib2data/src/grammar/ContextFree/LG.h
@@ -52,7 +52,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const LG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp
index 6f580f2f01b62d618c58b1b4eb8856a6b6ed1aa6..110e98fcec3205a703bf1fa6e6b7ecb9cd4051ac 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp
@@ -119,10 +119,6 @@ bool CSG::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int CSG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int CSG::compare(const CSG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.h b/alib2data/src/grammar/ContextSensitive/CSG.h
index 15f7f56915ef1b90e6519c51a6ef46cdf7ee59cb..e4baa92f6888e9dab03192d4a9e8e7c1b80f5412 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.h
+++ b/alib2data/src/grammar/ContextSensitive/CSG.h
@@ -44,7 +44,10 @@ public:
void setGeneratesEpsilon(bool genEps);
bool getGeneratesEpsilon() const;
- virtual int compare(const ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const CSG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
index 44b8108f0cccbd366d843e2441951b9610032a50..76d215bf1a41f3d53ee4bb5bc199b083cb2acf98 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
@@ -100,10 +100,6 @@ bool NonContractingGrammar::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int NonContractingGrammar::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int NonContractingGrammar::compare(const NonContractingGrammar& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
index d89d141ec8b83c168e201113ce227a011b46ed29..37e32edd57d9c954180f5b4660e04b73accfd3e2 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
@@ -44,7 +44,10 @@ public:
void setGeneratesEpsilon(bool genEps);
bool getGeneratesEpsilon() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const NonContractingGrammar& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp
index b379a7208ef098c54fca700ecf709639a6e146bf..f5dfa37595cba1337019a02a2da1e9aa68ea595a 100644
--- a/alib2data/src/grammar/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/Regular/LeftLG.cpp
@@ -165,10 +165,6 @@ bool LeftLG::removeRawRule(const alphabet::Symbol& leftHandSide, const std::vect
}
}
-int LeftLG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LeftLG::compare(const LeftLG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Regular/LeftLG.h b/alib2data/src/grammar/Regular/LeftLG.h
index b7efe183de36ec3675bccebfa222682148779fce..1c662378e814be864c4eb2a3023794f179f1e473 100644
--- a/alib2data/src/grammar/Regular/LeftLG.h
+++ b/alib2data/src/grammar/Regular/LeftLG.h
@@ -51,7 +51,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const LeftLG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp
index 1af289bbbbeaf4e5caaa0c1aa57beac3eda53423..9eaefcd56ae1eb8dc8dbcad302c94e97a9894b4c 100644
--- a/alib2data/src/grammar/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/Regular/LeftRG.cpp
@@ -169,10 +169,6 @@ bool LeftRG::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int LeftRG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LeftRG::compare(const LeftRG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Regular/LeftRG.h b/alib2data/src/grammar/Regular/LeftRG.h
index 88e4c3a338e2e453349e80607b949ca91fffeec5..de7ddb40c6800d45a056762729c05be042b3c141 100644
--- a/alib2data/src/grammar/Regular/LeftRG.h
+++ b/alib2data/src/grammar/Regular/LeftRG.h
@@ -124,7 +124,9 @@ public:
/**
* double dispatch operator helper
*/
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
/**
* compare
diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp
index 6585010a010105f3b4c62112eaf682eebff54ed6..837ef724207a4fd2ea3a21afa8a10a2af9d85d74 100644
--- a/alib2data/src/grammar/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/Regular/RightLG.cpp
@@ -165,10 +165,6 @@ bool RightLG::removeRawRule(const alphabet::Symbol& leftHandSide, const std::vec
}
}
-int RightLG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RightLG::compare(const RightLG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Regular/RightLG.h b/alib2data/src/grammar/Regular/RightLG.h
index d2ba02c50c624155b0a6986201efabb194c56db0..cef83c1fb4c36a7b6642cc51323ba2b55f804fdd 100644
--- a/alib2data/src/grammar/Regular/RightLG.h
+++ b/alib2data/src/grammar/Regular/RightLG.h
@@ -51,7 +51,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RightLG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp
index e89179b96df53f4b088f6a3ab3c036685c56b571..2ebd043344d9841df82958c663268b51e4866b03 100644
--- a/alib2data/src/grammar/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/Regular/RightRG.cpp
@@ -169,10 +169,6 @@ bool RightRG::getGeneratesEpsilon() const {
return generatesEpsilon;
}
-int RightRG::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int RightRG::compare(const RightRG& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Regular/RightRG.h b/alib2data/src/grammar/Regular/RightRG.h
index eea1c9c595e389402a01880108612bd0f01c8cb3..d28cc62c79b09029850b6a5f8c64e64d5f67563c 100644
--- a/alib2data/src/grammar/Regular/RightRG.h
+++ b/alib2data/src/grammar/Regular/RightRG.h
@@ -71,7 +71,10 @@ public:
void setGeneratesEpsilon(bool genEps);
bool getGeneratesEpsilon() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const RightRG& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index e10ea337dce77361b01c91420658a67abe35e43d..474a2c6a5a90e6b471dbc5817d00f0498bdfdd7b 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -105,10 +105,6 @@ bool ContextPreservingUnrestrictedGrammar::removeRule(const std::vector<alphabet
return rules[make_tuple(lContext, leftHandSide, rContext)].erase(rightHandSide);
}
-int ContextPreservingUnrestrictedGrammar::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ContextPreservingUnrestrictedGrammar::compare(const ContextPreservingUnrestrictedGrammar& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
index 14c86b9ec22313789092ac7d201e1fcdf2dad34f..4de7f9fd185d5f74515ab9b3948c5add224c7956 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
@@ -40,7 +40,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const ContextPreservingUnrestrictedGrammar& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
index 4bce0a3fc3c61c13f527ed738c139f080fe85b36..c70d74fe4cc8a6f58067162c3396f4239f1e1fcd 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
@@ -86,10 +86,6 @@ bool UnrestrictedGrammar::removeRule(const std::vector<alphabet::Symbol>& leftHa
return rules[leftHandSide].erase(rightHandSide);
}
-int UnrestrictedGrammar::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int UnrestrictedGrammar::compare(const UnrestrictedGrammar& other) const {
auto first = std::tie(terminalAlphabet, nonterminalAlphabet, initialSymbol, rules);
auto second = std::tie(other.terminalAlphabet, other.nonterminalAlphabet, other.initialSymbol, other.rules);
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
index 2a445e12b0211bdf933e74a807d116c94603d2b9..bb776833557497d2d04ca3d94b85bd0fe7b6d3cd 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
@@ -40,7 +40,10 @@ public:
bool removeNonterminalSymbol(const alphabet::Symbol& symbol);
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnrestrictedGrammar& other) const;
virtual void operator>>(std::ostream& os) const;
diff --git a/alib2data/src/label/HexavigesimalLabel.cpp b/alib2data/src/label/HexavigesimalLabel.cpp
index 1aa1a2e70360eeacd631ee62ad1db0b083b52769..3c767facc48a0810740c2637146c6604898499ed 100644
--- a/alib2data/src/label/HexavigesimalLabel.cpp
+++ b/alib2data/src/label/HexavigesimalLabel.cpp
@@ -26,10 +26,6 @@ int HexavigesimalLabel::getData() const {
return hexavigesimal;
}
-int HexavigesimalLabel::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int HexavigesimalLabel::compare(const HexavigesimalLabel& other) const {
return hexavigesimal - other.hexavigesimal;
}
diff --git a/alib2data/src/label/HexavigesimalLabel.h b/alib2data/src/label/HexavigesimalLabel.h
index 2987991840d37c49fc98a13d5ba6c5c6e65a88ac..465524b3c12ba0b1b779ff40d70cf01deb5a4964 100644
--- a/alib2data/src/label/HexavigesimalLabel.h
+++ b/alib2data/src/label/HexavigesimalLabel.h
@@ -38,7 +38,10 @@ public:
*/
int getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const HexavigesimalLabel& other) const;
virtual void operator>>(std::ostream&) const;
diff --git a/alib2data/src/label/LabelPairLabel.cpp b/alib2data/src/label/LabelPairLabel.cpp
index 5b7c485203880e79332faaffa4a63a176d963290..55f8d2d78efd9ad41108210779c939fd427f8a2a 100644
--- a/alib2data/src/label/LabelPairLabel.cpp
+++ b/alib2data/src/label/LabelPairLabel.cpp
@@ -31,10 +31,6 @@ const std::pair<Label, Label>& LabelPairLabel::getData() const {
return label;
}
-int LabelPairLabel::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LabelPairLabel::compare(const LabelPairLabel& other) const {
int res = label.first.getData().compare(other.label.first.getData());
if(res == 0) res = label.second.getData().compare(other.label.second.getData());
diff --git a/alib2data/src/label/LabelPairLabel.h b/alib2data/src/label/LabelPairLabel.h
index e2d9a8ddccfa3c0d1c3c270e4aa2948ed6474cd4..0c01b4228e54172ed188ad37d3e9d3983b0c45f5 100644
--- a/alib2data/src/label/LabelPairLabel.h
+++ b/alib2data/src/label/LabelPairLabel.h
@@ -42,7 +42,10 @@ public:
*/
const std::pair<Label, Label>& getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const LabelPairLabel& other) const;
virtual void operator>>(std::ostream&) const;
diff --git a/alib2data/src/label/LabelSetLabel.cpp b/alib2data/src/label/LabelSetLabel.cpp
index 81c5225a29a50d2572c2097e3125bc8c9c0b7b87..012c687376fcf4ba32551e7ea469d40dde3b4fc6 100644
--- a/alib2data/src/label/LabelSetLabel.cpp
+++ b/alib2data/src/label/LabelSetLabel.cpp
@@ -31,10 +31,6 @@ const std::set<Label>& LabelSetLabel::getData() const {
return label;
}
-int LabelSetLabel::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LabelSetLabel::compare(const LabelSetLabel& other) const {
if(label == other.label) {
return 0;
diff --git a/alib2data/src/label/LabelSetLabel.h b/alib2data/src/label/LabelSetLabel.h
index 951d106b9c140bb34a72ec45c178bf505a12ad2a..f9e393ef6b29e5be60db778bd9df24e0c55b5c90 100644
--- a/alib2data/src/label/LabelSetLabel.h
+++ b/alib2data/src/label/LabelSetLabel.h
@@ -42,7 +42,10 @@ public:
*/
const std::set<Label>& getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const LabelSetLabel& other) const;
virtual void operator>>(std::ostream&) const;
diff --git a/alib2data/src/label/ObjectLabel.cpp b/alib2data/src/label/ObjectLabel.cpp
index 985115b3e7b135edfabf75929f9eb59efbcb784c..e07535061ed2cb864065336b3804eb904b64431b 100644
--- a/alib2data/src/label/ObjectLabel.cpp
+++ b/alib2data/src/label/ObjectLabel.cpp
@@ -29,10 +29,6 @@ const alib::Object& ObjectLabel::getData() const {
return label;
}
-int ObjectLabel::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int ObjectLabel::compare(const ObjectLabel& other) const {
return label.getData().compare(other.label.getData());
}
diff --git a/alib2data/src/label/ObjectLabel.h b/alib2data/src/label/ObjectLabel.h
index f57b0553d93e7596aeb76dce03fd20a6fc5b9d72..b435aeda59f6ce16d2c159f925d77d338e79705b 100644
--- a/alib2data/src/label/ObjectLabel.h
+++ b/alib2data/src/label/ObjectLabel.h
@@ -40,7 +40,9 @@ public:
*/
const alib::Object& getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const ObjectLabel& other) const;
diff --git a/alib2data/src/label/PrimitiveLabel.cpp b/alib2data/src/label/PrimitiveLabel.cpp
index 35f63ae282c4bb7b6385478d60dc65446c088589..cabddfc85671aed58430896ab7503667b7f6756f 100644
--- a/alib2data/src/label/PrimitiveLabel.cpp
+++ b/alib2data/src/label/PrimitiveLabel.cpp
@@ -29,10 +29,6 @@ const primitive::Primitive& PrimitiveLabel::getData() const {
return primitive;
}
-int PrimitiveLabel::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int PrimitiveLabel::compare(const PrimitiveLabel& other) const {
return primitive.getData().compare(other.primitive.getData());
}
diff --git a/alib2data/src/label/PrimitiveLabel.h b/alib2data/src/label/PrimitiveLabel.h
index ed447b33cec5a469f82ffacb8a6c6676ef098bfe..b783b066986e9480cb6a587292dd60d54307fdf8 100644
--- a/alib2data/src/label/PrimitiveLabel.h
+++ b/alib2data/src/label/PrimitiveLabel.h
@@ -40,7 +40,10 @@ public:
*/
const primitive::Primitive& getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const PrimitiveLabel& other) const;
virtual void operator>>(std::ostream&) const;
diff --git a/alib2data/src/object/Void.cpp b/alib2data/src/object/Void.cpp
index 4476934083d204f3a503a2d33ff975ed35a3a95e..2d539d67b7501682bc585758b8f160de10c8b63f 100644
--- a/alib2data/src/object/Void.cpp
+++ b/alib2data/src/object/Void.cpp
@@ -21,10 +21,6 @@ ObjectBase* Void::plunder() && {
return new Void(std::move(*this));
}
-int Void::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int Void::compare(const Void&) const {
return 0;
}
diff --git a/alib2data/src/object/Void.h b/alib2data/src/object/Void.h
index 7a47c43f9bfd717579606d8b3889943e7a2fcab9..6c2eedcb35f2a034edfeaae19ed314afac018b6d 100644
--- a/alib2data/src/object/Void.h
+++ b/alib2data/src/object/Void.h
@@ -28,7 +28,10 @@ public:
virtual ObjectBase* clone() const;
virtual ObjectBase* plunder() &&;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const Void& other) const;
virtual void operator>>(std::ostream& out) const;
diff --git a/alib2data/src/primitive/Character.cpp b/alib2data/src/primitive/Character.cpp
index 925d7da08b67c985bb85a36a8d124efa47c32aef..1182a4bf6b60cbcd29f083ae884e66be4807cbb9 100644
--- a/alib2data/src/primitive/Character.cpp
+++ b/alib2data/src/primitive/Character.cpp
@@ -25,10 +25,6 @@ char Character::getData() const {
return data;
}
-int Character::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int Character::compare(const Character& other) const {
return data - other.data;
}
diff --git a/alib2data/src/primitive/Character.h b/alib2data/src/primitive/Character.h
index 2edfe63ce5a7b97535f3101e3b1c4a40018822ea..842a21a4f54387772dbf7ca0af8df59323e5574f 100644
--- a/alib2data/src/primitive/Character.h
+++ b/alib2data/src/primitive/Character.h
@@ -38,7 +38,10 @@ public:
*/
char getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const Character& other) const;
virtual void operator>>(std::ostream&) const;
diff --git a/alib2data/src/primitive/Integer.cpp b/alib2data/src/primitive/Integer.cpp
index 45635444cc97097ec91515aac764f35e90aa34eb..70bc8e335d7768038e6962ad7e18823da3c98130 100644
--- a/alib2data/src/primitive/Integer.cpp
+++ b/alib2data/src/primitive/Integer.cpp
@@ -25,10 +25,6 @@ int Integer::getData() const {
return data;
}
-int Integer::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int Integer::compare(const Integer& other) const {
return data - other.data;
}
diff --git a/alib2data/src/primitive/Integer.h b/alib2data/src/primitive/Integer.h
index 0b71a0c33f199cffb57fdb8d94bf38cdc787ffa7..42aedfd0870da3b0f0f9cb91107311fdabd87b69 100644
--- a/alib2data/src/primitive/Integer.h
+++ b/alib2data/src/primitive/Integer.h
@@ -37,7 +37,9 @@ public:
*/
int getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const Integer& other) const;
diff --git a/alib2data/src/primitive/String.cpp b/alib2data/src/primitive/String.cpp
index 659b0310456c595a896a4eb5bae3488ee2f5699e..5fcc6edb63dda0289fc75aa53f3813049394cd77 100644
--- a/alib2data/src/primitive/String.cpp
+++ b/alib2data/src/primitive/String.cpp
@@ -29,10 +29,6 @@ const std::string& String::getData() const {
return data;
}
-int String::compare(const alib::ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int String::compare(const String& other) const {
return data.compare(other.data);
}
diff --git a/alib2data/src/primitive/String.h b/alib2data/src/primitive/String.h
index 1dc3f129653d041ba1c5fb2d2d575c0971984a96..83bde177e842fa7e156b473f9866bfbfbb5e396a 100644
--- a/alib2data/src/primitive/String.h
+++ b/alib2data/src/primitive/String.h
@@ -40,7 +40,9 @@ public:
*/
const std::string& getData() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const String& other) const;
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index 6f5ef888dbe1f531cc9a68a5d419d136dd4dfdeb..c5911cf80e4f7e126fa18aad08c3264e7d8de836 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -142,10 +142,6 @@ void FormalRegExp::operator >>(std::ostream& out) const {
out << "(FormalRegExp " << *(this->regExp) << ")";
}
-int FormalRegExp::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExp::compare(const FormalRegExp& other) const {
int res = regExp->compare(*other.regExp);
if(res == 0) {
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index c8045b63e2f706e71c4e8d779f4a32a1f9681687..7a283401c769eb30d152c07dbf87c56ee04d788e 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -112,7 +112,10 @@ public:
*/
virtual void operator>>(std::ostream& out) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExp& other) const;
virtual operator std::string() const;
diff --git a/alib2data/src/regexp/formal/FormalRegExpAlternation.cpp b/alib2data/src/regexp/formal/FormalRegExpAlternation.cpp
index d6cae69d65f764585f473e3a0036790b1e190908..622910ba0a4755857346ef1fb9d8e1a6132c6558 100644
--- a/alib2data/src/regexp/formal/FormalRegExpAlternation.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpAlternation.cpp
@@ -128,10 +128,6 @@ UnboundedRegExpElement* FormalRegExpAlternation::cloneAsUnbounded() const {
return res;
}
-int FormalRegExpAlternation::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpAlternation::compare(const FormalRegExpAlternation& other) const {
int res = left->compare(*other.left);
if(res == 0) res = right->compare(*other.right);
diff --git a/alib2data/src/regexp/formal/FormalRegExpAlternation.h b/alib2data/src/regexp/formal/FormalRegExpAlternation.h
index 5d4e51bdb12f327904a3d62a04873f0bf8398529..b31853b98f6f0e7a4817d65a7ecafb05fb02821e 100644
--- a/alib2data/src/regexp/formal/FormalRegExpAlternation.h
+++ b/alib2data/src/regexp/formal/FormalRegExpAlternation.h
@@ -92,7 +92,10 @@ public:
void setRightElement(const FormalRegExpElement& element);
void setRightElement(FormalRegExpElement&& element);
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpAlternation&) const;
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExpConcatenation.cpp b/alib2data/src/regexp/formal/FormalRegExpConcatenation.cpp
index 5eb76c295e1360983a10b91a121853e50edaa0ad..9dee89ae1e92ea9760ab9e8c1a885a8d0deb05c0 100644
--- a/alib2data/src/regexp/formal/FormalRegExpConcatenation.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpConcatenation.cpp
@@ -127,10 +127,6 @@ FormalRegExpElement* FormalRegExpConcatenation::plunder() && {
return new FormalRegExpConcatenation(std::move(*this));
}
-int FormalRegExpConcatenation::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpConcatenation::compare(const FormalRegExpConcatenation& other) const {
int res = left->compare(*other.left);
if(res == 0) res = right->compare(*other.right);
diff --git a/alib2data/src/regexp/formal/FormalRegExpConcatenation.h b/alib2data/src/regexp/formal/FormalRegExpConcatenation.h
index ca2463c3bc8b665d94631ab998c72cf675487871..0b53a274e71c2aaa003cdebe77edf00b800d521e 100644
--- a/alib2data/src/regexp/formal/FormalRegExpConcatenation.h
+++ b/alib2data/src/regexp/formal/FormalRegExpConcatenation.h
@@ -90,7 +90,10 @@ public:
void setRightElement(const FormalRegExpElement& element);
void setRightElement(FormalRegExpElement&& element);
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpConcatenation&) const;
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExpEmpty.cpp b/alib2data/src/regexp/formal/FormalRegExpEmpty.cpp
index 964ac14ea6c590cf38395626e7db871fa12d179d..e9762b674e467bbd684611dd6a7402e2926cc6eb 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEmpty.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpEmpty.cpp
@@ -44,10 +44,6 @@ UnboundedRegExpElement* FormalRegExpEmpty::cloneAsUnbounded() const {
return new UnboundedRegExpEmpty();
}
-int FormalRegExpEmpty::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpEmpty::compare(const FormalRegExpEmpty&) const {
return 0;
}
diff --git a/alib2data/src/regexp/formal/FormalRegExpEmpty.h b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
index 94fe4f51299a9de917ce4a687d6e8a7f79abec66..f4825479d51c420625bd96bba20b53a89f333ff8 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEmpty.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
@@ -55,7 +55,10 @@ public:
*/
virtual FormalRegExpElement* plunder() &&;
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpEmpty&) const;
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExpEpsilon.cpp b/alib2data/src/regexp/formal/FormalRegExpEpsilon.cpp
index ad3414027fd1ebfc825f69f2d65ffcf9f01380b7..63f85748df44338b34ea800f8497bac214bd2052 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEpsilon.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpEpsilon.cpp
@@ -45,10 +45,6 @@ UnboundedRegExpElement* FormalRegExpEpsilon::cloneAsUnbounded() const {
return new UnboundedRegExpEpsilon();
}
-int FormalRegExpEpsilon::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpEpsilon::compare(const FormalRegExpEpsilon&) const {
return 0;
}
diff --git a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
index 6ab5146a9735aff1451f8f2602e4a39cc87ae395..72c32e5afbd1f38928f8beb39264b5b5ef467535 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
@@ -56,7 +56,10 @@ public:
*/
virtual FormalRegExpElement* plunder() &&;
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpEpsilon&) const;
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExpIteration.cpp b/alib2data/src/regexp/formal/FormalRegExpIteration.cpp
index 785f8543cab817b11e6c411490fad43943b91cc7..1eef7c48589b27c6f806120393105d4181a36c35 100644
--- a/alib2data/src/regexp/formal/FormalRegExpIteration.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpIteration.cpp
@@ -93,10 +93,6 @@ UnboundedRegExpElement* FormalRegExpIteration::cloneAsUnbounded() const {
return res;
}
-int FormalRegExpIteration::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpIteration::compare(const FormalRegExpIteration& other) const {
return element->compare(*other.element);
}
diff --git a/alib2data/src/regexp/formal/FormalRegExpIteration.h b/alib2data/src/regexp/formal/FormalRegExpIteration.h
index 830d6e8562de3ea22c31d8e14da994f8a8571585..ccd265a4b8803822a5aa6e85563733fd8a4e21ee 100644
--- a/alib2data/src/regexp/formal/FormalRegExpIteration.h
+++ b/alib2data/src/regexp/formal/FormalRegExpIteration.h
@@ -85,7 +85,10 @@ public:
void setElement(FormalRegExpElement&& element);
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpIteration&) const;
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExpSymbol.cpp b/alib2data/src/regexp/formal/FormalRegExpSymbol.cpp
index ef8ec7f7ee66c510b3d1ffa8978b7da8f720e10c..e2c1b5547471c139c88e86d76c5caa80cd0763e7 100644
--- a/alib2data/src/regexp/formal/FormalRegExpSymbol.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExpSymbol.cpp
@@ -78,10 +78,6 @@ bool operator==(const alphabet::Symbol& first, const FormalRegExpSymbol& second)
return first == second.symbol;
}
-int FormalRegExpSymbol::compare(const FormalRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int FormalRegExpSymbol::compare(const FormalRegExpSymbol& other) const {
return symbol.getData().compare(other.symbol.getData());
}
diff --git a/alib2data/src/regexp/formal/FormalRegExpSymbol.h b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
index 110adea9afee084f3824fd5db39f9e3ff4a63de8..f5046071791cda34bcf2b23788a352bf1b086968 100644
--- a/alib2data/src/regexp/formal/FormalRegExpSymbol.h
+++ b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
@@ -67,7 +67,10 @@ public:
bool operator==(const alphabet::Symbol&) const;
friend bool operator==(const alphabet::Symbol&, const FormalRegExpSymbol&);
- virtual int compare(const FormalRegExpElement&) const;
+ virtual int compare(const FormalRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const FormalRegExpSymbol&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index 77a3ddb7445d99001ba033c7042cf232b85d7de7..c9ad463d311b3cec90c341471b05a613fbe0fc5a 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -142,10 +142,6 @@ void UnboundedRegExp::operator >>(std::ostream& out) const {
out << "(UnboundedRegExp " << *(this->regExp) << ")";
}
-int UnboundedRegExp::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExp::compare(const UnboundedRegExp& other) const {
int res = regExp->compare(*other.regExp);
if(res == 0) {
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index e6f3d531e70ffc3a0d473e612905e55adb18939a..63c6f448388e7b78a764b1718cb8fd80b2430269 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -112,7 +112,10 @@ public:
*/
virtual void operator>>(std::ostream& out) const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExp& other) const;
virtual operator std::string() const;
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.cpp
index b81cb5a0f656b54b8dd8c3be34dd562c9adaa1ee..1df63332c4bcb26e854d83660faa5ca981da25f1 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.cpp
@@ -108,10 +108,6 @@ FormalRegExpElement* UnboundedRegExpAlternation::cloneAsFormal() const {
return res;
}
-int UnboundedRegExpAlternation::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpAlternation::compare(const UnboundedRegExpAlternation& other) const {
int thisSize = this->elements.size();
int otherSize = other.elements.size();
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
index 669d29d9136eadd478b3cfa8bf06713d7e95a1ae..f2c2faf69bcfd5364a2295ec0906dbb1e5f5f66f 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
@@ -86,7 +86,10 @@ public:
*/
void appendElement(UnboundedRegExpElement&& element);
- virtual int compare(const UnboundedRegExpElement&) const;
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpAlternation&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.cpp
index a632d5bcaccd805492b8b333933a0cc8fd5e2564..334d1c1e8dedea952c668d005bc602e8089da161 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.cpp
@@ -107,10 +107,6 @@ FormalRegExpElement* UnboundedRegExpConcatenation::cloneAsFormal() const {
return res;
}
-int UnboundedRegExpConcatenation::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpConcatenation::compare(const UnboundedRegExpConcatenation& other) const {
int thisSize = this->elements.size();
int otherSize = other.elements.size();
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
index c69543fc03d5f810fc36e8b0eda552b9d1feb8a9..bee29e7164e8e14063847601c22aab9bb317e653 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
@@ -85,7 +85,10 @@ public:
void appendElement(UnboundedRegExpElement&& element);
- virtual int compare(const UnboundedRegExpElement&) const;
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpConcatenation&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.cpp
index 893ab6b978a3663914eb3fde6f074a0e71208e20..ca5c670c85c7aaadbc9c81376b41ddf31d8e4d1d 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.cpp
@@ -45,10 +45,6 @@ FormalRegExpElement* UnboundedRegExpEmpty::cloneAsFormal() const {
return new FormalRegExpEmpty();
}
-int UnboundedRegExpEmpty::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpEmpty::compare(const UnboundedRegExpEmpty&) const {
return 0;
}
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
index eff46b883215b2b13d6b3bea92262e9ca5ed9ba1..d978c92b909b8fbf40fd5e7816893f0a5d29b00d 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
@@ -54,7 +54,10 @@ public:
*/
virtual UnboundedRegExpElement* plunder() &&;
- virtual int compare(const UnboundedRegExpElement&) const;
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpEmpty&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.cpp
index c1662b17e3fc0079d5cd493763df2cfdea35648b..964d1dd1d91aa9add2ef1dc385e5aefd1ec27d5b 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.cpp
@@ -45,10 +45,6 @@ FormalRegExpElement* UnboundedRegExpEpsilon::cloneAsFormal() const {
return new FormalRegExpEpsilon();
}
-int UnboundedRegExpEpsilon::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpEpsilon::compare(const UnboundedRegExpEpsilon&) const {
return 0;
}
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
index 974a276582d40b95c61334788b698f3cb2abc718..ef72a8d2b329e1da1fcdaff19b37a70d5590cff6 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
@@ -54,9 +54,11 @@ public:
* @copydoc UnboundedRegExpElement::plunder() const
*/
virtual UnboundedRegExpElement* plunder() &&;
-
-
- virtual int compare(const UnboundedRegExpElement&) const;
+
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpEpsilon&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.cpp
index 2e597696382e66a5de77767448d1330f4482b692..2b139cabb640da88325b7ebd7df3f5b2b9369d33 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.cpp
@@ -93,10 +93,6 @@ FormalRegExpElement* UnboundedRegExpIteration::cloneAsFormal() const {
return res;
}
-int UnboundedRegExpIteration::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpIteration::compare(const UnboundedRegExpIteration& other) const {
return element->compare(*other.element);
}
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
index 30bf2f8fe36bb981e799c0d10887b6c9bb3469ad..1c37dd47548ee4f413025e9dd5cfe28b5d29acc0 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
@@ -84,7 +84,10 @@ public:
void setElement(UnboundedRegExpElement&& element);
- virtual int compare(const UnboundedRegExpElement&) const;
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpIteration&) const;
/**
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.cpp
index f06d1c16864c4fee47a135862d0c7398d9867e9c..47e5e49ad0587b596f115f06b7471cd0630fd511 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.cpp
@@ -78,10 +78,6 @@ bool operator==(const alphabet::Symbol& first, const UnboundedRegExpSymbol& seco
return first == second.symbol;
}
-int UnboundedRegExpSymbol::compare(const UnboundedRegExpElement& other) const {
- return -other.compare(*this);
-}
-
int UnboundedRegExpSymbol::compare(const UnboundedRegExpSymbol& other) const {
return symbol.getData().compare(other.symbol.getData());
}
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
index 8491667ba36906d1ca5141aae99e42ede9b40e4e..b567b01d04c6ca821a38212f01b6bfa193f82f65 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
@@ -66,7 +66,10 @@ public:
bool operator==(const alphabet::Symbol&) const;
friend bool operator==(const alphabet::Symbol&, const UnboundedRegExpSymbol&);
- virtual int compare(const UnboundedRegExpElement&) const;
+ virtual int compare(const UnboundedRegExpElement& other) const {
+ return -other.compare(*this);
+ }
+
virtual int compare(const UnboundedRegExpSymbol&) const;
/**
diff --git a/alib2data/src/string/CyclicString.cpp b/alib2data/src/string/CyclicString.cpp
index 9ff586a65a07f15ca4960f444ade7fc10f59b010..d78d72bedc59ed4d04cc0a3b8bac78e4e0aeb3ba 100644
--- a/alib2data/src/string/CyclicString.cpp
+++ b/alib2data/src/string/CyclicString.cpp
@@ -89,10 +89,6 @@ bool CyclicString::isEmpty() const {
return this->m_Data.size() == 0;
}
-int CyclicString::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int CyclicString::compare(const LinearString& other) const {
if(this->isEmpty() && other.isEmpty()) {
if(alphabet == other.getAlphabet())
diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h
index 0d1113a6659a6efbf23b6647a18179de92bbf693..2026c6f1d523190bcc8ac879c001a6cffb734a23 100644
--- a/alib2data/src/string/CyclicString.h
+++ b/alib2data/src/string/CyclicString.h
@@ -52,7 +52,9 @@ public:
*/
bool isEmpty() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const LinearString& other) const;
virtual int compare(const CyclicString& other) const;
diff --git a/alib2data/src/string/Epsilon.cpp b/alib2data/src/string/Epsilon.cpp
index 9430ab404739812ed3a4db8dbbd254204d970df4..620c4a81f39d95eebdba21b736c8d2403aa300f0 100644
--- a/alib2data/src/string/Epsilon.cpp
+++ b/alib2data/src/string/Epsilon.cpp
@@ -34,10 +34,6 @@ bool Epsilon::isEmpty() const {
return true;
}
-int Epsilon::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int Epsilon::compare(const Epsilon& other) const {
if(alphabet == other.alphabet)
return 0;
diff --git a/alib2data/src/string/Epsilon.h b/alib2data/src/string/Epsilon.h
index 0a2e4b3a2eb021d2ef58ddeb5c3f941deec33147..e25f4806b6b557f1d9cd8f6f13ad9cc273f84f50 100644
--- a/alib2data/src/string/Epsilon.h
+++ b/alib2data/src/string/Epsilon.h
@@ -40,7 +40,9 @@ public:
*/
bool isEmpty() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const LinearString& other) const;
virtual int compare(const CyclicString& other) const;
diff --git a/alib2data/src/string/LinearString.cpp b/alib2data/src/string/LinearString.cpp
index 082475acc255ec4e327f848dbaa9de6066b6d550..7f66a4839a6f6d46dc757f0cb5f3b17b5a30db10 100644
--- a/alib2data/src/string/LinearString.cpp
+++ b/alib2data/src/string/LinearString.cpp
@@ -100,10 +100,6 @@ bool LinearString::isEmpty() const {
return this->m_Data.size() == 0;
}
-int LinearString::compare(const ObjectBase& other) const {
- return -other.compare(*this);
-}
-
int LinearString::compare(const LinearString& other) const {
auto first = std::tie(m_Data, alphabet);
auto second = std::tie(other.m_Data, other.alphabet);
diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h
index a6921c5225b17e811cc0009857ba78c075e85339..ee463d1ea400124df4c488ccf7653bed3efe647e 100644
--- a/alib2data/src/string/LinearString.h
+++ b/alib2data/src/string/LinearString.h
@@ -60,7 +60,9 @@ public:
*/
bool isEmpty() const;
- virtual int compare(const alib::ObjectBase& other) const;
+ virtual int compare(const ObjectBase& other) const {
+ return -other.compare(*this);
+ }
virtual int compare(const LinearString& other) const;
virtual int compare(const CyclicString& other) const;