Integration into IvyLeague

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

1 files changed, 32 insertions, 35 deletions

diff --git a/dnn/Criterion.cc b/dnn/Criterion.cc
index edef576..d5ac1f6 100755
--- a/dnn/Criterion.cc
+++ b/dnn/Criterion.cc
@@ -14,53 +14,52 @@
 
 #include "Criterion.h"
 
-DnnBaseCriterion :: DnnBaseCriterion ()
+IvlBaseCriterion :: IvlBaseCriterion ()
 {
 }
 
-DnnBaseCriterion :: ~DnnBaseCriterion ()
+IvlBaseCriterion :: ~IvlBaseCriterion ()
 {
 }
 
-
-DnnAndCriterion :: DnnAndCriterion ()
-: DnnBaseCriterion (),
+IvlAndCriterion :: IvlAndCriterion ()
+: IvlBaseCriterion (),
   Conditions ()
 {
 }
 
-DnnAndCriterion :: ~DnnAndCriterion ()
+IvlAndCriterion :: ~IvlAndCriterion ()
 {
 }
 
-DnnAndCriterion&
-DnnAndCriterion :: operator &= (DnnBaseCriterion& b)
+IvlAndCriterion&
+IvlAndCriterion :: operator &= (IvlBaseCriterion& b)
 {
 	Conditions.Append (&b);
 	return *this;
 }
 
-DnnAndCriterion&
-DnnAndCriterion :: operator &= (DnnOrCriterion& b)
+IvlAndCriterion&
+IvlAndCriterion :: operator &= (IvlOrCriterion& b)
 {
 	Conditions.Append (&b);
 	return *this;
 }
 
-DnnAndCriterion&
-DnnAndCriterion :: operator &= (DnnAndCriterion& b)
+IvlAndCriterion&
+IvlAndCriterion :: operator &= (IvlAndCriterion& b)
 {
-	CcuListIterOf <DnnBaseCriterion> li = b.Conditions;
+	IvlListIterOf <IvlBaseCriterion> li = b.Conditions;
 	while (++li)
 		Conditions.Append (*li);
 	return *this;
 }
 
 bool
-DnnAndCriterion :: Test (DnnEvent& ev)
+IvlAndCriterion :: Test (IvlEvent& ev)
 {
 	bool res = true;
-	CcuListIterOf <DnnBaseCriterion> li = Conditions;
+	IvlListIterOf <IvlBaseCriterion> li = Conditions;
 	while (res && ++li)
 #ifdef CPLUS_BUG22
 		res = bool (res && (*li)->Test (ev));
@@ -70,45 +69,44 @@ DnnAndCriterion :: Test (DnnEvent& ev)
 	return res;
 }
 
-
-DnnOrCriterion :: DnnOrCriterion ()
-: DnnBaseCriterion (),
+IvlOrCriterion :: IvlOrCriterion ()
+: IvlBaseCriterion (),
   Alternatives ()
 {
 }
 
-DnnOrCriterion :: ~DnnOrCriterion ()
+IvlOrCriterion :: ~IvlOrCriterion ()
 {
 }
 
-DnnOrCriterion&
-DnnOrCriterion :: operator |= (DnnOrCriterion& b)
+IvlOrCriterion&
+IvlOrCriterion :: operator |= (IvlOrCriterion& b)
 {
-	CcuListIterOf <DnnBaseCriterion> li = b.Alternatives;
+	IvlListIterOf <IvlBaseCriterion> li = b.Alternatives;
 	while (++li)
 		Alternatives.Append (*li);
 	return *this;
 }
 
-DnnOrCriterion&
-DnnOrCriterion :: operator |= (DnnBaseCriterion& b)
+IvlOrCriterion&
+IvlOrCriterion :: operator |= (IvlBaseCriterion& b)
 {
 	Alternatives.Append (&b);
 	return *this;
 }
 
-DnnOrCriterion&
-DnnOrCriterion :: operator |= (DnnAndCriterion& b)
+IvlOrCriterion&
+IvlOrCriterion :: operator |= (IvlAndCriterion& b)
 {
 	Alternatives.Append (&b);
 	return *this;
 }
 
 bool
-DnnOrCriterion :: Test (DnnEvent& ev)
+IvlOrCriterion :: Test (IvlEvent& ev)
 {
 	bool res = false;
-	CcuListIterOf <DnnBaseCriterion> li = Alternatives;
+	IvlListIterOf <IvlBaseCriterion> li = Alternatives;
 	while (!res && ++li)
 #ifdef CPLUS_BUG22
 		res = bool (res || (*li)->Test (ev));
@@ -118,25 +116,24 @@ DnnOrCriterion :: Test (DnnEvent& ev)
 	return res;
 }
 
-
-DnnBasicCriterion :: DnnBasicCriterion ()
-: DnnBaseCriterion (),
+IvlBasicCriterion :: IvlBasicCriterion ()
+: IvlBaseCriterion (),
   Check (0)
 {
 }
 
-DnnBasicCriterion :: DnnBasicCriterion (bool (*c) (DnnEvent&))
-: DnnBaseCriterion (),
+IvlBasicCriterion :: IvlBasicCriterion (bool (*c) (IvlEvent&))
+: IvlBaseCriterion (),
   Check (c)
 {
 }
 
-DnnBasicCriterion :: ~DnnBasicCriterion ()
+IvlBasicCriterion :: ~IvlBasicCriterion ()
 {
 }
 
 bool
-DnnBasicCriterion :: Test (DnnEvent& e)
+IvlBasicCriterion :: Test (IvlEvent& e)
 {
 	return Check ? (*Check) (e) : false;
 }