Integration into IvyLeague

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

1 files changed, 47 insertions, 48 deletions

diff --git a/dnn/Criterion.h b/dnn/Criterion.h
index 92dd48a..e878ddf 100755
--- a/dnn/Criterion.h
+++ b/dnn/Criterion.h
@@ -10,94 +10,93 @@
  *
  *	$Id$
  *	$CurLog$
- *	Removed pragma interfaces
  */
 
-#ifndef DnnCriterion_H_
-#define DnnCriterion_H_
+#ifndef IvlCriterion_H_
+#define IvlCriterion_H_
 
 #include "cplus_bugs.h"
-#include "ccu/bool.h"
-#include "ccu/List.h"
-class DnnEvent;
+#include "ivl/bool.h"
+#include "ivl/List.h"
+class IvlEvent;
 
-class DnnBaseCriterion {
-friend	class	DnnAndCriterion;
-friend	class	DnnOrCriterion;
+class IvlBaseCriterion {
+friend	class	IvlAndCriterion;
+friend	class	IvlOrCriterion;
 protected:
-		DnnBaseCriterion ();
-		~DnnBaseCriterion ();
+		IvlBaseCriterion ();
+		~IvlBaseCriterion ();
 public:
-virtual	bool	Test (DnnEvent&) = 0;
+virtual	bool	Test (IvlEvent&) = 0;
 };
 
-class DnnOrCriterion;
+class IvlOrCriterion;
 
-class DnnAndCriterion : public DnnBaseCriterion {
-friend	class	DnnOrCriterion;
+class IvlAndCriterion : public IvlBaseCriterion {
+friend	class	IvlOrCriterion;
 protected:
-	CcuListOf <DnnBaseCriterion>	Conditions;
-	bool	Test (DnnEvent&);
+	IvlListOf <IvlBaseCriterion>	Conditions;
+	bool	Test (IvlEvent&);
 public:
-		DnnAndCriterion ();
-		~DnnAndCriterion ();
-	DnnAndCriterion&	operator &= (DnnBaseCriterion&);
-	DnnAndCriterion&	operator &= (DnnOrCriterion&);
-	DnnAndCriterion&	operator &= (DnnAndCriterion&);
+		IvlAndCriterion ();
+		~IvlAndCriterion ();
+	IvlAndCriterion&	operator &= (IvlBaseCriterion&);
+	IvlAndCriterion&	operator &= (IvlOrCriterion&);
+	IvlAndCriterion&	operator &= (IvlAndCriterion&);
 };
 
-class DnnOrCriterion : public DnnBaseCriterion {
-friend	class	DnnAndCriterion;
+class IvlOrCriterion : public IvlBaseCriterion {
+friend	class	IvlAndCriterion;
 protected:
-	CcuListOf <DnnBaseCriterion>	Alternatives;
-	bool	Test (DnnEvent&);
+	IvlListOf <IvlBaseCriterion>	Alternatives;
+	bool	Test (IvlEvent&);
 public:
-		DnnOrCriterion ();
-		~DnnOrCriterion ();
-	DnnOrCriterion&	operator |= (DnnBaseCriterion&);
-	DnnOrCriterion&	operator |= (DnnOrCriterion&);
-	DnnOrCriterion&	operator |= (DnnAndCriterion&);
+		IvlOrCriterion ();
+		~IvlOrCriterion ();
+	IvlOrCriterion&	operator |= (IvlBaseCriterion&);
+	IvlOrCriterion&	operator |= (IvlOrCriterion&);
+	IvlOrCriterion&	operator |= (IvlAndCriterion&);
 };
 
-class DnnBasicCriterion : public DnnBaseCriterion {
+class IvlBasicCriterion : public IvlBaseCriterion {
 protected:
-	bool  (*Check) (DnnEvent&);
-	bool Test (DnnEvent& e);
+	bool  (*Check) (IvlEvent&);
+	bool Test (IvlEvent& e);
 
 public:
-		DnnBasicCriterion ();
-		DnnBasicCriterion (bool  (*c) (DnnEvent&));
-		~DnnBasicCriterion ();
-inline	void	ChangeCriterion (bool (*c) (DnnEvent&))	{Check = c; }
+		IvlBasicCriterion ();
+		IvlBasicCriterion (bool  (*c) (IvlEvent&));
+		~IvlBasicCriterion ();
+inline	void	ChangeCriterion (bool (*c) (IvlEvent&))	{Check = c; }
 };
 
-template <class T> class DnnCriterionOf : public DnnBaseCriterion {
+template <class T> class IvlCriterionOf : public IvlBaseCriterion {
 protected:
 	T&	Object;
-	void	(T::*Check)	(DnnEvent&);
+	void	(T::*Check)	(IvlEvent&);
 
 public:
-		DnnCriterionOf (T& o, void (T::*c) (DnnEvent&)) : DnnBaseCriterion (), Object (o), Check (c)	{}
-		~DnnCriterionOf ()	{}
-	bool	Test (DnnEvent& ev)	{ return (Object.*Check) (ev); }
+		IvlCriterionOf (T& o, void (T::*c) (IvlEvent&)) : IvlBaseCriterion (), Object (o), Check (c)	{}
+		~IvlCriterionOf ()	{}
+	bool	Test (IvlEvent& ev)	{ return (Object.*Check) (ev); }
 };
 
 #define SpecializedCriterion(R,S) \
 \
-class R : public DnnBaseCriterion { \
+class R : public IvlBaseCriterion { \
 \
 protected: \
 \
     S& Body; \
-    bool  (S::*SpecializedCheck) (DnnEvent&); \
+    bool  (S::*SpecializedCheck) (IvlEvent&); \
 \
 public: \
 \
-    R (S& s, bool  (S::*sc) (DnnEvent&)) : DnnBaseCriterion (), Body (s), SpecializedCheck (sc) {} \
+    R (S& s, bool  (S::*sc) (IvlEvent&)) : IvlBaseCriterion (), Body (s), SpecializedCheck (sc) {} \
    ~R () {} \
 \
-    bool  Test (DnnEvent& e) { return (Body.*SpecializedCheck) (e); } \
+    bool  Test (IvlEvent& e) { return (Body.*SpecializedCheck) (e); } \
 \
 };
 
-#endif	/* DnnCriterion_H_ */
+#endif	/* IvlCriterion_H_ */