From 3a6bd282b5543b748f6e9e55dc8ea09a8da7e115 Mon Sep 17 00:00:00 2001
From: Jan Vesely <janvesely@janvesely.net>
Date: Sun, 10 Nov 2013 21:41:01 +0100
Subject: [PATCH] fix breaking changes in fsm determinization caused by latest
commits
---
adeterminize.fsm/src/FSMDeterminizer.cpp | 4 ++--
adeterminize.fsm/src/FSMDeterminizer.h | 2 +-
adeterminize.fsm/src/adeterminize.fsm.cpp | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/adeterminize.fsm/src/FSMDeterminizer.cpp b/adeterminize.fsm/src/FSMDeterminizer.cpp
index ea8d98933f..5c5007921a 100644
--- a/adeterminize.fsm/src/FSMDeterminizer.cpp
+++ b/adeterminize.fsm/src/FSMDeterminizer.cpp
@@ -46,8 +46,8 @@ set<State> FSMDeterminizer::findTargetStatesInNfsm(const set<State>& nfsmStates,
for (set<TransitionFSM>::iterator transition = nfsmTransitions.begin();
transition != nfsmTransitions.end();
transition++) {
- if (transition->getCurrent() == *state && transition->getInput() == input) {
- nextStates.insert(transition->getNext());
+ if (transition->getFrom() == *state && transition->getInput() == input) {
+ nextStates.insert(transition->getTo());
}
}
}
diff --git a/adeterminize.fsm/src/FSMDeterminizer.h b/adeterminize.fsm/src/FSMDeterminizer.h
index e51bef5c29..3990a57349 100644
--- a/adeterminize.fsm/src/FSMDeterminizer.h
+++ b/adeterminize.fsm/src/FSMDeterminizer.h
@@ -8,7 +8,7 @@
#include <algorithm>
#include "automaton/State.h"
-#include "automaton/Symbol.h"
+#include "alphabet/Symbol.h"
#include "automaton/FSM/FSM.h"
#include "automaton/FSM/TransitionFSM.h"
diff --git a/adeterminize.fsm/src/adeterminize.fsm.cpp b/adeterminize.fsm/src/adeterminize.fsm.cpp
index 05e308e0f8..e3281e5faf 100644
--- a/adeterminize.fsm/src/adeterminize.fsm.cpp
+++ b/adeterminize.fsm/src/adeterminize.fsm.cpp
@@ -9,27 +9,27 @@
using namespace std;
using namespace automaton;
+using namespace alib;
int main(int argc, char** argv) {
- UnknownAutomaton* automaton;
+ UnknownAutomaton automaton;
try {
string input(istreambuf_iterator<char>(cin), (istreambuf_iterator<char>()));
automaton = AutomatonFactory::fromString(input);
- Automaton* knownAutomaton = AutomatonFactory::buildAutomaton(automaton);
+ Automaton* knownAutomaton = AutomatonFactory::buildAutomaton(&automaton);
// TODO check that automaton is FSM
FSMDeterminizer determinizer((FSM*) knownAutomaton);
FSM* deterministicFSM = determinizer.determinize();
deterministicFSM->toXML(cout);
- delete automaton;
delete knownAutomaton;
delete deterministicFSM;
} catch (AlibException& e) {
- cout << e.toString() << endl;
+ cout << e.what() << endl;
return 0;
}
}
\ No newline at end of file
--
GitLab