Integration into IvyLeague

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

1 files changed, 28 insertions, 28 deletions

diff --git a/dnn/Behaviour.cc b/dnn/Behaviour.cc
index 98a5b8d..a078c94 100755
--- a/dnn/Behaviour.cc
+++ b/dnn/Behaviour.cc
@@ -17,47 +17,47 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-DnnToken :: DnnToken ()
+IvlToken :: IvlToken ()
 {
 }
 
-DnnToken :: ~DnnToken ()
+IvlToken :: ~IvlToken ()
 {
 }
 
-DnnState :: DnnState (const char* name)
+IvlState :: IvlState (const char* name)
 : Name (name),
   Transitions ()
 {
 }
 
-DnnState :: ~DnnState ()
+IvlState :: ~IvlState ()
 {
-	CcuListIterOf <DnnTransition> t = Transitions;
+	IvlListIterOf <IvlTransition> t = Transitions;
 	while (++t)
 		delete *t;
 }
 
-DnnTransition*
-DnnState :: CreateTransition (const char* name, DnnState* s, DnnActivation* a, DnnAction* aa)
+IvlTransition*
+IvlState :: CreateTransition (const char* name, IvlState* s, IvlActivation* a, IvlAction* aa)
 {
-	DnnTransition* t = new DnnTransition (name, this, s, a, aa);
+	IvlTransition* t = new IvlTransition (name, this, s, a, aa);
 	Transitions.Append (t);
 	return t;
 }
 
 void
-DnnState :: Activate (DnnBehaviour* b, DnnToken* tk)
+IvlState :: Activate (IvlBehaviour* b, IvlToken* tk)
 {
-	CcuListIterOf <DnnTransition> t = Transitions;
+	IvlListIterOf <IvlTransition> t = Transitions;
 	while (++t) {
-		DnnBehaviourReaction* r = new DnnBehaviourReaction (b, *t);
+		IvlBehaviourReaction* r = new IvlBehaviourReaction (b, *t);
 		(*t)->Activate (r, tk);
 		b->AddReaction (r);
 	}
 }
 
-DnnTransition :: DnnTransition (const char* name, DnnState* from, DnnState* to, DnnActivation* a, DnnAction* aa)
+IvlTransition :: IvlTransition (const char* name, IvlState* from, IvlState* to, IvlActivation* a, IvlAction* aa)
 : Name (name),
   From (from),
   To (to),
@@ -66,45 +66,45 @@ DnnTransition :: DnnTransition (const char* name, DnnState* from, DnnState* to,
 {
 }
 
-DnnTransition :: ~DnnTransition ()
+IvlTransition :: ~IvlTransition ()
 {
 }
 
 void
-DnnTransition :: Activate (DnnBaseReaction* r, DnnToken* t)
+IvlTransition :: Activate (IvlBaseReaction* r, IvlToken* t)
 {
 	(*Activation) (r, t);
 }
 
-DnnState*
-DnnTransition :: Fire (DnnToken* tk, DnnEvent* ev)
+IvlState*
+IvlTransition :: Fire (IvlToken* tk, IvlEvent* ev)
 {
 	(*Action) (tk, ev);
 	return To;
 }
 
-DnnBehaviourModel :: DnnBehaviourModel ()
+IvlBehaviourModel :: IvlBehaviourModel ()
 : Initial (0),
   States ()
 {
 }
 
-DnnBehaviourModel :: ~DnnBehaviourModel ()
+IvlBehaviourModel :: ~IvlBehaviourModel ()
 {
-	CcuListIterOf <DnnState> s = States;
+	IvlListIterOf <IvlState> s = States;
 	while (++s)
 		delete *s;
 }
 
-DnnState*
-DnnBehaviourModel :: CreateState (const char* name)
+IvlState*
+IvlBehaviourModel :: CreateState (const char* name)
 {
-	DnnState* s = new DnnState (name);
+	IvlState* s = new IvlState (name);
 	States.Append (s);
 	return s;
 }
 
-DnnBehaviour :: DnnBehaviour (DnnBehaviourModel& m, DnnToken* tk)
+IvlBehaviour :: IvlBehaviour (IvlBehaviourModel& m, IvlToken* tk)
 : TheModel (&m),
   CurState (m.GetInitial ()),
   CurReactions (),
@@ -114,7 +114,7 @@ DnnBehaviour :: DnnBehaviour (DnnBehaviourModel& m, DnnToken* tk)
 }
 
 void
-DnnBehaviour :: Fire (DnnTransition* t, DnnEvent* ev)
+IvlBehaviour :: Fire (IvlTransition* t, IvlEvent* ev)
 {
 	/* check consistency */
 	if (CurState != t->GetOrigin ()) {
@@ -123,7 +123,7 @@ DnnBehaviour :: Fire (DnnTransition* t, DnnEvent* ev)
 	}
 
 	/* disactivate */
-	DnnBaseReaction* r;
+	IvlBaseReaction* r;
 	while (r = CurReactions.RemoveFirst ())
 		delete r;
 
@@ -134,18 +134,18 @@ DnnBehaviour :: Fire (DnnTransition* t, DnnEvent* ev)
 	CurState->Activate (this, CurToken);
 }
 
-DnnBehaviourReaction :: DnnBehaviourReaction (DnnBehaviour* b, DnnTransition* t)
+IvlBehaviourReaction :: IvlBehaviourReaction (IvlBehaviour* b, IvlTransition* t)
   : TheBehaviour (b),
     TheTransition (t)
 {
 }
 
-DnnBehaviourReaction :: ~DnnBehaviourReaction ()
+IvlBehaviourReaction :: ~IvlBehaviourReaction ()
 {
 }
 
 void
-DnnBehaviourReaction :: Manage (DnnEvent& ev)
+IvlBehaviourReaction :: Manage (IvlEvent& ev)
 {
 	TheBehaviour->Fire (TheTransition, &ev);
 }