- chained FsmMode and FsmProcess

git-svn-id: http://moon:8086/svn/software/trunk/projects/FsmEval@137 b431acfa-c32f-4a4a-93f1-934dc6c82436

FsmMode.hpp

@@ -0,0 +1,176 @@
+/* 
+ * File:   FsmMode.hpp
+ * Author: jens
+ *
+ * Created on 24. Januar 2015, 15:54
+ */
+
+#ifndef FSMMODE_HPP
+#define	FSMMODE_HPP
+
+#include "AStateMachine.hpp"
+#include "FsmProcess.hpp"
+
+class ModeContext
+{
+public:
+	ModeContext(FsmProcess *init, FsmProcess *mode0, FsmProcess *mode1)
+	: fsmInit(init)
+	, fsmMode0(mode0)
+	, fsmMode1(mode1)
+	{
+		
+	}
+	
+	~ModeContext() {}
+
+	FsmProcess *fsmInit;
+	FsmProcess *fsmMode0;
+	FsmProcess *fsmMode1;
+	
+};
+
+class IFsmMode
+{
+public:
+	
+	enum StateId
+	{
+		INIT=0,
+		MODE0,
+		MODE1,
+		NUM_STATES
+	};
+	
+	IFsmMode() 
+	{
+		
+	}
+	
+	virtual ~IFsmMode()
+	{
+		
+	}
+	
+	virtual void process(int x)
+	{
+		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+	}
+	
+};
+
+class FsmMode : public AStateMachine<IFsmMode::StateId>
+{
+public:
+
+	FsmMode(ModeContext &ctx)
+	: AStateMachine()
+	, init(IFsmMode::INIT, ctx)
+	, mode0(IFsmMode::MODE0, ctx)
+	, mode1(IFsmMode::MODE1, ctx)
+	{
+		add(&init);
+		add(&mode0);
+		add(&mode1);
+	}
+	
+	~FsmMode()
+	{
+	}
+	
+	void process(int x)
+	{
+		dynamic_cast<IFsmMode*>(currState())->process(x);
+	}
+
+private:
+	class AStateBase : public AState<IFsmMode::StateId>, public IFsmMode
+	{
+	public:
+		AStateBase(IFsmMode::StateId id, ModeContext &context)
+		: AState(id)
+		, m_context(context)
+		{
+			
+		}
+
+	protected:
+		ModeContext &m_context;
+		
+	};
+	
+	class StateInit : public AStateBase
+	{
+	public:
+		StateInit(IFsmMode::StateId id, ModeContext &context)
+		: AStateBase(id, context)
+		{
+
+		}
+
+		~StateInit() {}
+
+		// Transition to Init is reset
+		void onTransition()
+		{
+			m_context.fsmMode0->reset();
+			m_context.fsmMode1->reset();
+		}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			
+			if (x == 10)
+				setState(IFsmMode::MODE0);
+		}
+
+	};
+	
+	class StateMode0 : public AStateBase
+	{
+	public:
+		StateMode0(IFsmMode::StateId id, ModeContext &context)
+		: AStateBase(id, context)
+		{
+
+		}
+
+		~StateMode0() {}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			m_context.fsmMode0->process(x);
+			if (x == 20)
+				setState(IFsmMode::MODE1);
+		}
+
+	};
+
+	class StateMode1 : public AStateBase
+	{
+	public:
+		StateMode1(IFsmMode::StateId id, ModeContext &context)
+		: AStateBase(id, context)
+		{
+
+		}
+
+		~StateMode1() {}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			m_context.fsmMode1->process(x);
+		}
+
+	};
+private:
+	StateInit init;
+	StateMode0 mode0;
+	StateMode1 mode1;
+};
+
+#endif	/* FSMMODE_HPP */
+

FsmProcess.hpp

@@ -0,0 +1,218 @@
+/* 
+ * File:   FsmProcess.hpp
+ * Author: jens
+ *
+ * Created on 24. Januar 2015, 15:45
+ */
+
+#ifndef FSMPROCESS_HPP
+#define	FSMPROCESS_HPP
+
+#include "AStateMachine.hpp"
+
+class Context
+{
+public:
+	Context()
+	: m_count(0)
+	{
+		
+	}
+	
+	~Context() {}
+
+	int m_count;
+	
+};
+class IFsmProcess
+{
+public:
+	
+	enum StateId
+	{
+		INIT=0,
+		IDLE,
+		ACTIVE_0,
+		ACTIVE_1,
+		NUM_STATES
+	};
+	
+	IFsmProcess() 
+	{
+		
+	}
+	
+	virtual ~IFsmProcess()
+	{
+		
+	}
+	
+	virtual void process(int x)
+	{
+		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+	}
+	
+};
+
+class FsmProcess : public AStateMachine<IFsmProcess::StateId>
+{
+public:
+
+	FsmProcess(Context &context)
+	: AStateMachine()
+	, init(IFsmProcess::INIT, context)
+	, idle(IFsmProcess::IDLE, context)
+	, active0(IFsmProcess::ACTIVE_0, context)
+	, active1(IFsmProcess::ACTIVE_1, context)
+	{
+		add(&init);
+		add(&idle);
+		add(&active0);
+		add(&active1);
+	}
+	
+	~FsmProcess()
+	{
+	}
+	
+	void process(int x)
+	{
+		dynamic_cast<IFsmProcess*>(currState())->process(x);
+	}
+	
+private:
+
+	class StateInit : public AState<IFsmProcess::StateId>, public IFsmProcess
+	{
+	public:
+		StateInit(IFsmProcess::StateId id, Context &context)
+		: AState(id)
+		, m_context(context)
+		{
+
+		}
+
+		~StateInit() {}
+
+		// Transition to Init is reset
+		void onTransition()
+		{
+			printf("%s\n", __PRETTY_FUNCTION__);
+		}
+		
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			setState(IFsmProcess::IDLE);
+		}
+
+	private:
+		Context &m_context;
+	};
+
+	class StateIdle : public AState<IFsmProcess::StateId>, public IFsmProcess
+	{
+	public:
+		StateIdle(IFsmProcess::StateId id, Context &context)
+		: AState(id)
+		, m_context(context)
+		{
+
+		}
+
+		~StateIdle() {}
+
+		void onTransition()
+		{
+			printf("%s\n", __PRETTY_FUNCTION__);
+			m_context.m_count = 0;
+		}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			if (x >= 10)
+			{
+				setState(IFsmProcess::ACTIVE_0);
+			}
+		}
+
+	private:
+		Context &m_context;
+	};
+
+	class StateActive0 : public AState<IFsmProcess::StateId>, public IFsmProcess
+	{
+	public:
+		StateActive0(IFsmProcess::StateId id, Context &context)
+		: AState(id)
+		, m_context(context)
+		{
+
+		}
+
+		~StateActive0() {}
+
+		void onTransition()
+		{
+			m_context.m_count = 0;
+			printf("%s, Count = %d\n", __PRETTY_FUNCTION__, m_context.m_count);
+		}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+
+			m_context.m_count++;
+			if (m_context.m_count == 10)
+			{
+				setState(IFsmProcess::ACTIVE_1);
+			}
+		}
+
+	private:
+		Context &m_context;
+	};
+
+	class StateActive1 : public AState<IFsmProcess::StateId>, public IFsmProcess
+	{
+	public:
+		StateActive1(IFsmProcess::StateId id, Context &context)
+		: AState(id)
+		, m_context(context)
+		{
+
+		}
+
+		~StateActive1() {}
+
+		void onTransition()
+		{
+			m_context.m_count = 5;
+			printf("%s, Count = %d\n", __PRETTY_FUNCTION__, m_context.m_count);
+		}
+
+		void process(int x)
+		{
+			printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
+			m_context.m_count--;
+			if (m_context.m_count == 0)
+			{
+				setState(IFsmProcess::ACTIVE_0);
+			}
+		}
+
+	private:
+		Context &m_context;
+	};
+
+	StateInit init;
+	StateIdle idle;
+	StateActive0 active0;
+	StateActive1 active1;
+	
+};
+
+
+#endif	/* FSMPROCESS_HPP */
+

main.cpp

@@ -8,8 +8,8 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "AState.hpp"
+#include "FsmProcess.hpp"
-#include "AStateMachine.hpp"
+#include "FsmMode.hpp"
 
 using namespace std;
 
@@ -17,206 +17,20 @@ using namespace std;
  * 
  */
 
-class Context
-{
-public:
-	Context()
-	: m_count(0)
-	{
-		
-	}
-	
-	~Context() {}
-
-	int m_count;
-	
-};
-class IState
-{
-public:
-	IState() 
-	{
-		
-	}
-	
-	virtual ~IState()
-	{
-		
-	}
-	
-	virtual void process(int x)
-	{
-		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
-	}
-	
-};
-
-enum StateId
-{
-	INIT=0,
-	IDLE,
-	ACTIVE_0,
-	ACTIVE_1,
-	NUM_STATES
-};
-
-class StateMachine : public AStateMachine<StateId>
-{
-public:
-
-	StateMachine()
-	: AStateMachine()
-	{
-	}
-	
-	~StateMachine()
-	{
-	}
-	
-	void process(int x)
-	{
-		dynamic_cast<IState*>(currState())->process(x);
-	}
-	
-};
-
-class StateInit : public AState<StateId>, public IState
-{
-public:
-	StateInit(StateId id, Context &context)
-	: AState(id)
-	, m_context(context)
-	{
-		
-	}
-	
-	~StateInit() {}
-
-	void process(int x)
-	{
-		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
-		setState(IDLE);
-	}
-	
-private:
-	Context &m_context;
-};
-
-class StateIdle : public AState<StateId>, public IState
-{
-public:
-	StateIdle(StateId id, Context &context)
-	: AState(id)
-	, m_context(context)
-	{
-		
-	}
-	
-	~StateIdle() {}
-	
-	void onTransition()
-	{
-		printf("%s\n", __PRETTY_FUNCTION__);
-		m_context.m_count = 0;
-	}
-	
-	void process(int x)
-	{
-		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
-		if (x >= 10)
-		{
-			setState(ACTIVE_0);
-		}
-	}
-	
-private:
-	Context &m_context;
-};
-
-class StateActive0 : public AState<StateId>, public IState
-{
-public:
-	StateActive0(StateId id, Context &context)
-	: AState(id)
-	, m_context(context)
-	{
-		
-	}
-	
-	~StateActive0() {}
-	
-	void onTransition()
-	{
-		m_context.m_count = 0;
-		printf("%s, Count = %d\n", __PRETTY_FUNCTION__, m_context.m_count);
-	}
-
-	void process(int x)
-	{
-		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
-		
-		m_context.m_count++;
-		if (m_context.m_count == 10)
-		{
-			setState(ACTIVE_1);
-		}
-	}
-	
-private:
-	Context &m_context;
-};
-
-class StateActive1 : public AState<StateId>, public IState
-{
-public:
-	StateActive1(StateId id, Context &context)
-	: AState(id)
-	, m_context(context)
-	{
-		
-	}
-	
-	~StateActive1() {}
-	
-	void onTransition()
-	{
-		m_context.m_count = 5;
-		printf("%s, Count = %d\n", __PRETTY_FUNCTION__, m_context.m_count);
-	}
-
-	void process(int x)
-	{
-		printf("%s() x=%d\n", __PRETTY_FUNCTION__, x);
-		m_context.m_count--;
-		if (m_context.m_count == 0)
-		{
-			setState(ACTIVE_0);
-		}
-	}
-	
-private:
-	Context &m_context;
-};
-
 int main(int argc, char** argv)
 {
 	Context ctx;
-	StateMachine fsm;
+	FsmProcess fsmProcess0(ctx);
-	StateInit init(INIT, ctx);
+	FsmProcess fsmProcess1(ctx);
-	StateIdle idle(IDLE, ctx);
+	ModeContext mctx(0, &fsmProcess0, &fsmProcess1);
-	StateActive0 active0(ACTIVE_0, ctx);
+	FsmMode fsmMode(mctx);
-	StateActive1 active1(ACTIVE_1, ctx);
 	
-	fsm.add(&init);
+	fsmMode.reset();
-	fsm.add(&idle);
-	fsm.add(&active0);
-	fsm.add(&active1);
-	
-	fsm.reset();
 	for (int i=0; i < 1000; i++)
 	{
-		fsm.process(i);
+		fsmMode.process(i);
 	}
+	fsmMode.reset();
 
 	return 0;
 }

nbproject/configurations.xml

@@ -6,6 +6,8 @@
                    projectFiles="true">
       <itemPath>AState.hpp</itemPath>
       <itemPath>AStateMachine.hpp</itemPath>
+      <itemPath>FsmMode.hpp</itemPath>
+      <itemPath>FsmProcess.hpp</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
                    displayName="Resource Files"
@@ -42,6 +44,10 @@
       </item>
       <item path="AStateMachine.hpp" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="FsmMode.hpp" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="FsmProcess.hpp" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="main.cpp" ex="false" tool="1" flavor2="0">
       </item>
     </conf>
@@ -69,6 +75,10 @@
       </item>
       <item path="AStateMachine.hpp" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="FsmMode.hpp" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="FsmProcess.hpp" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="main.cpp" ex="false" tool="1" flavor2="0">
       </item>
     </conf>