diff --git a/adeterminize.fsm/src/FSMDeterminizer.cpp b/adeterminize.fsm/src/FSMDeterminizer.cpp index ea8d98933ffece811c0dd569bb6d716428d25864..5c5007921a7e888bbcc1cfc715c29e3179e6c2e1 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 e51bef5c29ca5098131bf303f96c39507d4ef079..3990a573492627643506b26920da6816bd5d5d2a 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 05e308e0f81b63004c994c1f95486835cc96e196..e3281e5faf04305d0bb31272a018e6f6357b542c 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