jens/FsmEval
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- template magic

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/FsmEval@139 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2015-01-24 20:13:43 +00:00
parent 42d61787bd
commit 27720942f4
6 changed files with 43 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FsmMode.hpp
+4 -6
View File
@@ -14,9 +14,8 @@
class ModeContext
{
public:
ModeContext(FsmProcess *init, FsmProcess *mode0, FsmProcess *mode1)
: fsmInit(init)
, fsmMode0(mode0)
ModeContext(FsmProcess<Mode0> *mode0, FsmProcess<Mode1> *mode1)
: fsmMode0(mode0)
, fsmMode1(mode1)
{
@@ -24,9 +23,8 @@ public:
~ModeContext() {}
FsmProcess *fsmInit;
FsmProcess *fsmMode0;
FsmProcess *fsmMode1;
FsmProcess<Mode0> *fsmMode0;
FsmProcess<Mode1> *fsmMode1;
};
FsmProcess.hpp
+24 -109
View File
@@ -10,6 +10,9 @@
#include "AStateMachine.hpp"
typedef struct {} Mode0;
typedef struct {} Mode1;
class Context
{
public:
@@ -54,57 +57,25 @@ public:
};
template <class modeType>
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);
}
FsmProcess(Context &context);
~FsmProcess();
void process(int x);
private:
class StateInit : public AState<IFsmProcess::StateId>, public IFsmProcess
{
public:
StateInit(IFsmProcess::StateId id, Context &context)
: AState(id)
, m_context(context)
{
}
~StateInit() {}
StateInit(IFsmProcess::StateId id, 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);
}
void onTransition();
void process(int x);
private:
Context &m_context;
@@ -113,29 +84,11 @@ private:
class StateIdle : public AState<IFsmProcess::StateId>, public IFsmProcess
{
public:
StateIdle(IFsmProcess::StateId id, Context &context)
: AState(id)
, m_context(context)
{
StateIdle(IFsmProcess::StateId id, Context &context);
~StateIdle();
}
~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);
}
}
void onTransition();
void process(int x);
private:
Context &m_context;
@@ -144,31 +97,11 @@ private:
class StateActive0 : public AState<IFsmProcess::StateId>, public IFsmProcess
{
public:
StateActive0(IFsmProcess::StateId id, Context &context)
: AState(id)
, m_context(context)
{
StateActive0(IFsmProcess::StateId id, Context &context);
~StateActive0();
}
~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);
}
}
void onTransition();
void process(int x);
private:
Context &m_context;
@@ -177,30 +110,11 @@ private:
class StateActive1 : public AState<IFsmProcess::StateId>, public IFsmProcess
{
public:
StateActive1(IFsmProcess::StateId id, Context &context)
: AState(id)
, m_context(context)
{
StateActive1(IFsmProcess::StateId id, Context &context);
~StateActive1();
}
~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);
}
}
void onTransition();
void process(int x);
private:
Context &m_context;
@@ -212,6 +126,7 @@ private:
StateActive1 active1;
};
#include "FsmProcess.tcc"
#endif /* FSMPROCESS_HPP */
main.cpp
+3 -3
View File
@@ -20,9 +20,9 @@ using namespace std;
int main(int argc, char** argv)
{
Context ctx;
FsmProcess fsmProcess0(ctx);
FsmProcess fsmProcess1(ctx);
ModeContext mctx(0, &fsmProcess0, &fsmProcess1);
FsmProcess<Mode0> fsmProcess0(ctx);
FsmProcess<Mode1> fsmProcess1(ctx);
ModeContext mctx(&fsmProcess0, &fsmProcess1);
FsmMode fsmMode(mctx);
fsmMode.reset();
nbproject/Makefile-Release.mk
+6
View File
@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/FsmProcess.o \
${OBJECTDIR}/main.o
@@ -62,6 +63,11 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fsmeval.exe: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fsmeval ${OBJECTFILES} ${LDLIBSOPTIONS}
${OBJECTDIR}/FsmProcess.o: FsmProcess.tcc
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FsmProcess.o FsmProcess.tcc
${OBJECTDIR}/main.o: main.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
nbproject/configurations.xml
+5
View File
@@ -8,6 +8,7 @@
<itemPath>AStateMachine.hpp</itemPath>
<itemPath>FsmMode.hpp</itemPath>
<itemPath>FsmProcess.hpp</itemPath>
<itemPath>FsmProcess.tcc</itemPath>
</logicalFolder>
<logicalFolder name="ResourceFiles"
displayName="Resource Files"
@@ -48,6 +49,8 @@
</item>
<item path="FsmProcess.hpp" ex="false" tool="3" flavor2="0">
</item>
<item path="FsmProcess.tcc" ex="true" tool="3" flavor2="0">
</item>
<item path="main.cpp" ex="false" tool="1" flavor2="0">
</item>
</conf>
@@ -79,6 +82,8 @@
</item>
<item path="FsmProcess.hpp" ex="false" tool="3" flavor2="0">
</item>
<item path="FsmProcess.tcc" ex="false" tool="1" flavor2="0">
</item>
<item path="main.cpp" ex="false" tool="1" flavor2="0">
</item>
</conf>
nbproject/project.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<name>FsmEval</name>
<c-extensions/>
<cpp-extensions>cpp</cpp-extensions>
<header-extensions>hpp</header-extensions>
<header-extensions>hpp,tcc</header-extensions>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects/>
<sourceRootList/>