From 605ae361385979acae8e1e5e32e89e6f4a78f0b5 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 14 Dec 2016 23:04:31 +0100
Subject: [PATCH] Use default data types in automaton simplify tests
---
.../simplify/FSMSingleInitialStateTest.cpp | 16 +++---
.../automaton/simplify/FSMTotalTest.cpp | 12 ++---
.../simplify/minimizeBrzozowskiTest.cpp | 18 +++----
.../automaton/simplify/minimizeTest.cpp | 18 +++----
.../automaton/simplify/normalizeTest.cpp | 18 +++----
.../test-src/automaton/simplify/trimTest.cpp | 52 +++++++++----------
6 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
index 7d8350f367..3ceffeabb7 100644
--- a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
@@ -19,14 +19,14 @@ void FSMSingleInitialStateTest::tearDown() {
}
void FSMSingleInitialStateTest::testSingleInitialState() {
- label::Label q = label::Label ("q");
- label::Label q0 = label::Label ("q0");
- label::Label q1 = label::Label ("q1");
- label::Label q2 = label::Label ("q2");
- label::Label q3 = label::Label ("q3");
-
- alphabet::Symbol a = alphabet::Symbol('a');
- alphabet::Symbol b = alphabet::Symbol('b');
+ DefaultStateType q = DefaultStateType ("q");
+ DefaultStateType q0 = DefaultStateType ("q0");
+ DefaultStateType q1 = DefaultStateType ("q1");
+ DefaultStateType q2 = DefaultStateType ("q2");
+ DefaultStateType q3 = DefaultStateType ("q3");
+
+ DefaultSymbolType a = DefaultSymbolType('a');
+ DefaultSymbolType b = DefaultSymbolType('b');
automaton::MultiInitialStateNFA < > automaton1;
automaton1.setStates({q0, q1, q2, q3});
diff --git a/alib2algo/test-src/automaton/simplify/FSMTotalTest.cpp b/alib2algo/test-src/automaton/simplify/FSMTotalTest.cpp
index e8f4e8ea63..0cfecbd2d7 100644
--- a/alib2algo/test-src/automaton/simplify/FSMTotalTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/FSMTotalTest.cpp
@@ -16,13 +16,13 @@ void TotalTest::tearDown() {
}
void TotalTest::testTotal() {
- label::Label q0 = label::Label ("q0");
- label::Label q1 = label::Label ("q1");
- label::Label q2 = label::Label ("q2");
+ DefaultStateType q0 = DefaultStateType ("q0");
+ DefaultStateType q1 = DefaultStateType ("q1");
+ DefaultStateType q2 = DefaultStateType ("q2");
- alphabet::Symbol a = alphabet::Symbol('a');
- alphabet::Symbol b = alphabet::Symbol('b');
- alphabet::Symbol c = alphabet::Symbol('c');
+ DefaultSymbolType a = DefaultSymbolType('a');
+ DefaultSymbolType b = DefaultSymbolType('b');
+ DefaultSymbolType c = DefaultSymbolType('c');
automaton::DFA<> automaton(q0);
automaton.setStates({q0, q1, q2});
diff --git a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
index 201429ff1d..9501072b2e 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
@@ -18,18 +18,18 @@ void minimizeBrzozowskiTest::tearDown() {
}
void minimizeBrzozowskiTest::testMinimizeBrzozowski() {
- automaton::DFA < > automaton(label::Label(1));
+ automaton::DFA < > automaton(DefaultStateType(1));
- automaton.addState(label::Label(1));
- automaton.addState(label::Label(2));
- automaton.addState(label::Label(3));
- automaton.addInputSymbol(alphabet::Symbol("a"));
- automaton.addInputSymbol(alphabet::Symbol("b"));
+ automaton.addState(DefaultStateType(1));
+ automaton.addState(DefaultStateType(2));
+ automaton.addState(DefaultStateType(3));
+ automaton.addInputSymbol(DefaultSymbolType("a"));
+ automaton.addInputSymbol(DefaultSymbolType("b"));
- automaton.addTransition(label::Label(1), alphabet::Symbol("a"), label::Label(2));
- automaton.addTransition(label::Label(2), alphabet::Symbol("b"), label::Label(1));
+ automaton.addTransition(DefaultStateType(1), DefaultSymbolType("a"), DefaultStateType(2));
+ automaton.addTransition(DefaultStateType(2), DefaultSymbolType("b"), DefaultStateType(1));
- automaton.addFinalState(label::Label(3));
+ automaton.addFinalState(DefaultStateType(3));
automaton::DFA<> minimizedHopcroft = automaton::simplify::Minimize::minimize(automaton);
automaton::DFA<> minimizedBrzozowski = automaton::simplify::MinimizeBrzozowski::minimize(automaton);
diff --git a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
index b3d6192362..2a15aac841 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
@@ -15,18 +15,18 @@ void minimizeTest::tearDown() {
}
void minimizeTest::testMinimize() {
- automaton::DFA < > automaton(label::Label(1));
+ automaton::DFA < > automaton(DefaultStateType(1));
- automaton.addState(label::Label(1));
- automaton.addState(label::Label(2));
- automaton.addState(label::Label(3));
- automaton.addInputSymbol(alphabet::Symbol("a"));
- automaton.addInputSymbol(alphabet::Symbol("b"));
+ automaton.addState(DefaultStateType(1));
+ automaton.addState(DefaultStateType(2));
+ automaton.addState(DefaultStateType(3));
+ automaton.addInputSymbol(DefaultSymbolType("a"));
+ automaton.addInputSymbol(DefaultSymbolType("b"));
- automaton.addTransition(label::Label(1), alphabet::Symbol("a"), label::Label(2));
- automaton.addTransition(label::Label(2), alphabet::Symbol("b"), label::Label(1));
+ automaton.addTransition(DefaultStateType(1), DefaultSymbolType("a"), DefaultStateType(2));
+ automaton.addTransition(DefaultStateType(2), DefaultSymbolType("b"), DefaultStateType(1));
- automaton.addFinalState(label::Label(3));
+ automaton.addFinalState(DefaultStateType(3));
automaton::DFA<> minimized = automaton::simplify::Minimize::minimize(automaton);
diff --git a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
index 66c4a1cf14..eb263efb63 100644
--- a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
@@ -15,18 +15,18 @@ void normalizeTest::tearDown() {
}
void normalizeTest::testNormalize() {
- automaton::DFA < > automaton(label::Label(0));
+ automaton::DFA < > automaton(DefaultStateType(0));
- automaton.addState(label::Label(0));
- automaton.addState(label::Label(1));
- automaton.addState(label::Label(2));
- automaton.addInputSymbol(alphabet::Symbol("a"));
- automaton.addInputSymbol(alphabet::Symbol("b"));
+ automaton.addState(DefaultStateType(0));
+ automaton.addState(DefaultStateType(1));
+ automaton.addState(DefaultStateType(2));
+ automaton.addInputSymbol(DefaultSymbolType("a"));
+ automaton.addInputSymbol(DefaultSymbolType("b"));
- automaton.addTransition(label::Label(0), alphabet::Symbol("a"), label::Label(1));
- automaton.addTransition(label::Label(1), alphabet::Symbol("b"), label::Label(2));
+ automaton.addTransition(DefaultStateType(0), DefaultSymbolType("a"), DefaultStateType(1));
+ automaton.addTransition(DefaultStateType(1), DefaultSymbolType("b"), DefaultStateType(2));
- automaton.addFinalState(label::Label(2));
+ automaton.addFinalState(DefaultStateType(2));
automaton::DFA<> normalized = automaton::simplify::Normalize::normalize(automaton);
diff --git a/alib2algo/test-src/automaton/simplify/trimTest.cpp b/alib2algo/test-src/automaton/simplify/trimTest.cpp
index 3ffaf11feb..f8abc7b7a9 100644
--- a/alib2algo/test-src/automaton/simplify/trimTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/trimTest.cpp
@@ -19,19 +19,19 @@ void trimTest::tearDown() {
}
void trimTest::testTrimAutomaton() {
- automaton::DFA < > automaton(label::Label(1));
+ automaton::DFA < > automaton(DefaultStateType(1));
- automaton.addState(label::Label(1));
- automaton.addState(label::Label(2));
- automaton.addState(label::Label(3));
- automaton.addInputSymbol(alphabet::Symbol("a"));
- automaton.addInputSymbol(alphabet::Symbol("b"));
+ automaton.addState(DefaultStateType(1));
+ automaton.addState(DefaultStateType(2));
+ automaton.addState(DefaultStateType(3));
+ automaton.addInputSymbol(DefaultSymbolType("a"));
+ automaton.addInputSymbol(DefaultSymbolType("b"));
- automaton.addTransition(label::Label(1), alphabet::Symbol("a"), label::Label(2));
- automaton.addTransition(label::Label(2), alphabet::Symbol("b"), label::Label(1));
- automaton.addTransition(label::Label(3), alphabet::Symbol("b"), label::Label(1));
+ automaton.addTransition(DefaultStateType(1), DefaultSymbolType("a"), DefaultStateType(2));
+ automaton.addTransition(DefaultStateType(2), DefaultSymbolType("b"), DefaultStateType(1));
+ automaton.addTransition(DefaultStateType(3), DefaultSymbolType("b"), DefaultStateType(1));
- automaton.addFinalState(label::Label(1));
+ automaton.addFinalState(DefaultStateType(1));
automaton::DFA<> trimed = automaton::simplify::Trim::trim(automaton);
@@ -39,25 +39,25 @@ void trimTest::testTrimAutomaton() {
}
void trimTest::testTrimGrammar() {
- grammar::RightRG < > rrGrammar(alphabet::Symbol(1));
+ grammar::RightRG < > rrGrammar(DefaultSymbolType(1));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(1));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(2));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(3));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(4));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(5));
- rrGrammar.addNonterminalSymbol(alphabet::Symbol(6));
- rrGrammar.addTerminalSymbol(alphabet::Symbol("a"));
- rrGrammar.addTerminalSymbol(alphabet::Symbol("b"));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(1));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(2));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(3));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(4));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(5));
+ rrGrammar.addNonterminalSymbol(DefaultSymbolType(6));
+ rrGrammar.addTerminalSymbol(DefaultSymbolType("a"));
+ rrGrammar.addTerminalSymbol(DefaultSymbolType("b"));
- rrGrammar.addRule(alphabet::Symbol(1), std::make_pair(alphabet::Symbol("a"), alphabet::Symbol(2)));
- rrGrammar.addRule(alphabet::Symbol(2), std::make_pair(alphabet::Symbol("b"), alphabet::Symbol(3)));
- rrGrammar.addRule(alphabet::Symbol(3), alphabet::Symbol("a"));
+ rrGrammar.addRule(DefaultSymbolType(1), std::make_pair(DefaultSymbolType("a"), DefaultSymbolType(2)));
+ rrGrammar.addRule(DefaultSymbolType(2), std::make_pair(DefaultSymbolType("b"), DefaultSymbolType(3)));
+ rrGrammar.addRule(DefaultSymbolType(3), DefaultSymbolType("a"));
- rrGrammar.addRule(alphabet::Symbol(4), std::make_pair(alphabet::Symbol("b"), alphabet::Symbol(5)));
- rrGrammar.addRule(alphabet::Symbol(5), alphabet::Symbol("a"));
- rrGrammar.addRule(alphabet::Symbol(5), std::make_pair(alphabet::Symbol("b"), alphabet::Symbol(2)));
- rrGrammar.addRule(alphabet::Symbol(6), std::make_pair(alphabet::Symbol("b"), alphabet::Symbol(6)));
+ rrGrammar.addRule(DefaultSymbolType(4), std::make_pair(DefaultSymbolType("b"), DefaultSymbolType(5)));
+ rrGrammar.addRule(DefaultSymbolType(5), DefaultSymbolType("a"));
+ rrGrammar.addRule(DefaultSymbolType(5), std::make_pair(DefaultSymbolType("b"), DefaultSymbolType(2)));
+ rrGrammar.addRule(DefaultSymbolType(6), std::make_pair(DefaultSymbolType("b"), DefaultSymbolType(6)));
grammar::RightRG < > trimed = grammar::simplify::Trim::trim(rrGrammar);
--
GitLab