Integration into IvyLeague

Dnn -> Ivl
Some class names changed, because of conflicts with previous Uch classes
Imakefile is replaced with Makefile

1 files changed, 56 insertions, 57 deletions

diff --git a/dnn/Behaviour.h b/dnn/Behaviour.h
index 2db049e..55fc8e5 100755
--- a/dnn/Behaviour.h
+++ b/dnn/Behaviour.h
@@ -12,93 +12,92 @@
  *	$CurLog$
  */
 
-#ifndef DnnBehaviour_H_
-#define DnnBehaviour_H_
+#ifndef IvlBehaviour_H_
+#define IvlBehaviour_H_
 
 #include "cplus_bugs.h"
 #include "Reaction.h"
-#include "ccu/String.h"
-#include "ccu/List.h"
+#include "ivl/String.h"
+#include "ivl/List.h"
 
-class DnnBehaviour;
-class DnnTransition;
-class DnnEvent;
+class IvlBehaviour;
+class IvlTransition;
+class IvlEvent;
 
-class DnnToken {
+class IvlToken {
 public:
-		DnnToken ();
-virtual		~DnnToken ();
+		IvlToken ();
+virtual		~IvlToken ();
 };
 
-typedef void (DnnActivation) (DnnBaseReaction*, DnnToken*);
-typedef void (DnnAction) (DnnToken*, DnnEvent*);
+typedef void (IvlActivation) (IvlBaseReaction*, IvlToken*);
+typedef void (IvlAction) (IvlToken*, IvlEvent*);
 
-class DnnState {
+class IvlState {
 protected:
-	CcuString	Name;
-	CcuListOf <DnnTransition>	Transitions;
+	IvlString	Name;
+	IvlListOf <IvlTransition>	Transitions;
 public:
-		DnnState (const char*);
-		~DnnState ();
-	DnnTransition*	CreateTransition (const char*, DnnState*, DnnActivation*, DnnAction*);
-	void	Activate (DnnBehaviour*, DnnToken*);
+		IvlState (const char*);
+		~IvlState ();
+	IvlTransition*	CreateTransition (const char*, IvlState*, IvlActivation*, IvlAction*);
+	void	Activate (IvlBehaviour*, IvlToken*);
 	
 };
 
-class DnnTransition {
+class IvlTransition {
 protected:
-	CcuString	Name;
-	DnnState*	From;
-	DnnState*	To;
-	DnnActivation*	Activation;
-	DnnAction*	Action;
+	IvlString	Name;
+	IvlState*	From;
+	IvlState*	To;
+	IvlActivation*	Activation;
+	IvlAction*	Action;
 
 public:
-		DnnTransition (const char*, DnnState*, DnnState*, DnnActivation*, DnnAction*);
-		~DnnTransition ();
-inline	DnnState*	GetDestination () const	{ return To;}
-inline	DnnState*	GetOrigin () const	{ return From;}
-	void	Activate (DnnBaseReaction*, DnnToken*);
-	DnnState*	Fire (DnnToken*, DnnEvent*);
+		IvlTransition (const char*, IvlState*, IvlState*, IvlActivation*, IvlAction*);
+		~IvlTransition ();
+inline	IvlState*	GetDestination () const	{ return To;}
+inline	IvlState*	GetOrigin () const	{ return From;}
+	void	Activate (IvlBaseReaction*, IvlToken*);
+	IvlState*	Fire (IvlToken*, IvlEvent*);
 };
 
-
-class DnnBehaviourModel {
+class IvlBehaviourModel {
 protected:
-	DnnState*	Initial;
-	CcuListOf <DnnState>	States;
+	IvlState*	Initial;
+	IvlListOf <IvlState>	States;
 public:
-		DnnBehaviourModel ();
-		~DnnBehaviourModel ();
-inline	DnnState*	GetInitial () const	{ return Initial; }
-inline	void	SetInitial (DnnState* s)	{ Initial = s; }
-	DnnState*	CreateState (const char* = 0);
+		IvlBehaviourModel ();
+		~IvlBehaviourModel ();
+inline	IvlState*	GetInitial () const	{ return Initial; }
+inline	void	SetInitial (IvlState* s)	{ Initial = s; }
+	IvlState*	CreateState (const char* = 0);
 };
 
-class DnnBehaviour {
-friend	class	DnnBehaviourReaction;
+class IvlBehaviour {
+friend	class	IvlBehaviourReaction;
 protected:
-	DnnBehaviourModel*	TheModel;
-	DnnState*	CurState;
-	CcuListOf <DnnBaseReaction>	CurReactions;
-	DnnToken*	CurToken;
-	void	Fire (DnnTransition*, DnnEvent*);
+	IvlBehaviourModel*	TheModel;
+	IvlState*	CurState;
+	IvlListOf <IvlBaseReaction>	CurReactions;
+	IvlToken*	CurToken;
+	void	Fire (IvlTransition*, IvlEvent*);
 public:
-		DnnBehaviour (DnnBehaviourModel&, DnnToken*);
-		~DnnBehaviour ();
-inline	void	AddReaction (DnnBaseReaction* r) { CurReactions.Append (r); }
+		IvlBehaviour (IvlBehaviourModel&, IvlToken*);
+		~IvlBehaviour ();
+inline	void	AddReaction (IvlBaseReaction* r) { CurReactions.Append (r); }
 
 };
 
-class DnnBehaviourReaction : public DnnBaseReaction {
+class IvlBehaviourReaction : public IvlBaseReaction {
 protected:
-	DnnBehaviour*	TheBehaviour;
-	DnnTransition*	TheTransition;
+	IvlBehaviour*	TheBehaviour;
+	IvlTransition*	TheTransition;
 public:
-		DnnBehaviourReaction (DnnBehaviour*, DnnTransition*);
-		~DnnBehaviourReaction ();
-	void	Manage (DnnEvent&);
+		IvlBehaviourReaction (IvlBehaviour*, IvlTransition*);
+		~IvlBehaviourReaction ();
+	void	Manage (IvlEvent&);
 };	
 
-#endif	/* DnnBehaviour_H_ */
+#endif	/* IvlBehaviour_H_ */