- removed IStateMachine.hpp

git-svn-id: http://moon:8086/svn/software/trunk/projects/FsmEval@135 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2015-01-24 12:07:40 +00:00
parent 251ac211bd
commit 0d8badfef1
5 changed files with 32 additions and 60 deletions
+26 -17
View File
@@ -51,7 +51,16 @@ public:
};
class StateMachine : public AStateMachine<IStateMachine::StateId>
enum StateId
{
INIT=0,
IDLE,
ACTIVE_0,
ACTIVE_1,
NUM_STATES
};
class StateMachine : public AStateMachine<StateId>
{
public:
@@ -71,10 +80,10 @@ public:
};
class StateInit : public AState<IStateMachine::StateId>, public IState
class StateInit : public AState<StateId>, public IState
{
public:
StateInit(IStateMachine::StateId id, Context &context)
StateInit(StateId id, Context &context)
: AState(id)
, m_context(context)
{
@@ -86,17 +95,17 @@ public:
void process(int x)
{
printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
setState(IStateMachine::IDLE);
setState(IDLE);
}
private:
Context &m_context;
};
class StateIdle : public AState<IStateMachine::StateId>, public IState
class StateIdle : public AState<StateId>, public IState
{
public:
StateIdle(IStateMachine::StateId id, Context &context)
StateIdle(StateId id, Context &context)
: AState(id)
, m_context(context)
{
@@ -116,7 +125,7 @@ public:
printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
if (x >= 10)
{
setState(IStateMachine::ACTIVE_0);
setState(ACTIVE_0);
}
}
@@ -124,10 +133,10 @@ private:
Context &m_context;
};
class StateActive0 : public AState<IStateMachine::StateId>, public IState
class StateActive0 : public AState<StateId>, public IState
{
public:
StateActive0(IStateMachine::StateId id, Context &context)
StateActive0(StateId id, Context &context)
: AState(id)
, m_context(context)
{
@@ -149,7 +158,7 @@ public:
m_context.m_count++;
if (m_context.m_count == 10)
{
setState(IStateMachine::ACTIVE_1);
setState(ACTIVE_1);
}
}
@@ -157,10 +166,10 @@ private:
Context &m_context;
};
class StateActive1 : public AState<IStateMachine::StateId>, public IState
class StateActive1 : public AState<StateId>, public IState
{
public:
StateActive1(IStateMachine::StateId id, Context &context)
StateActive1(StateId id, Context &context)
: AState(id)
, m_context(context)
{
@@ -181,7 +190,7 @@ public:
m_context.m_count--;
if (m_context.m_count == 0)
{
setState(IStateMachine::ACTIVE_0);
setState(ACTIVE_0);
}
}
@@ -193,10 +202,10 @@ int main(int argc, char** argv)
{
Context ctx;
StateMachine fsm;
StateInit init(IStateMachine::INIT, ctx);
StateIdle idle(IStateMachine::IDLE, ctx);
StateActive0 active0(IStateMachine::ACTIVE_0, ctx);
StateActive1 active1(IStateMachine::ACTIVE_1, ctx);
StateInit init(INIT, ctx);
StateIdle idle(IDLE, ctx);
StateActive0 active0(ACTIVE_0, ctx);
StateActive1 active1(ACTIVE_1, ctx);
fsm.add(&init);
fsm.add(&idle);