fix state index

Author: MarcG-TUE

include/maxplus/base/fsm/fsm.h

@@ -552,13 +552,13 @@ class FiniteStateMachine : public Abstract::FiniteStateMachine {
 
     State<StateLabelType, EdgeLabelType> *checkStateLabeled(const StateLabelType &s) {
         // try the index first
-        if (this->states.stateIndex.find(s) != this->states.stateIndex.end()) {
-            return this->states.stateIndex[s];
+        if (this->states.withLabel(s) != nullptr) {
+            return this->states.withLabel(s);
         }
         // for now just a linear search
-        typename SetOfStates<StateLabelType, EdgeLabelType>::CIter i = this->states.begin();
+        auto i = this->states.begin();
         while (i != this->states.end()) {
-            auto &t = *(i.second);
+            auto &t = dynamic_cast<State<StateLabelType, EdgeLabelType>&>(*((*i).second));
             if ((t.stateLabel) == s) {
                 this->states.addToStateIndex(s, &t);
                 return &t;

src/testbench/graph/mpautomatontest.cc

@@ -29,12 +29,10 @@ void MPAutomatonTest::testCreateFSM() {
     std::cout << "Running test: CreateFSM" << std::endl;
 
     MaxPlusAutomatonWithRewards mpa;
-    // One FSM state, three tokens:
-    CId fsm_s0 = 0;
 
-    MPARState *s1 = mpa.addState(makeMPAStateLabel(fsm_s0, 0));
-    MPARState *s2 = mpa.addState(makeMPAStateLabel(fsm_s0, 1));
-    MPARState *s3 = mpa.addState(makeMPAStateLabel(fsm_s0, 2));
+    MPARState *s1 = mpa.addState(makeMPAStateLabel(0, 0));
+    MPARState *s2 = mpa.addState(makeMPAStateLabel(0, 1));
+    MPARState *s3 = mpa.addState(makeMPAStateLabel(0, 2));
 
     mpa.addEdge(*s1, makeRewardEdgeLabel(MPTime(3.0), CString("A"), 1.0), *s2);
     mpa.addEdge(*s1, makeRewardEdgeLabel(MPTime(3.0), CString("A"), 1.0), *s3);
@@ -51,6 +49,9 @@ void MPAutomatonTest::testCreateFSM() {
 
     mpa.setInitialState(*s1);
 
+    auto s = mpa.checkStateLabeled(makeMPAStateLabel(0, 1));
+    ASSERT_THROW(s != nullptr);
+
     ASSERT_EQUAL_NOPRINT(s1, &(mpa.getInitialState()));
 }