Changeset 176 for code/branches

Timestamp:

Nov 7, 2007, 12:19:46 AM (17 years ago)

Author:

landauf

Message:

started to implement BaseIdentifier<class B> template

Location:

code/branches/objecthierarchie/src

Files:

• BaseObject.h (modified) (1 diff)
• ClassHierarchy.h (modified) (6 diffs)
• orxonox.cc (modified) (3 diffs)

code/branches/objecthierarchie/src/BaseObject.h

@@ -11 +11 @@
         public:
             BaseObject();
-            ~BaseObject();
+            virtual ~BaseObject();
 
             inline bool isA(Identifier* identifier)

code/branches/objecthierarchie/src/ClassHierarchy.h

@@ -4 +4 @@
 #include <string>
 #include <iostream>
-#include <assert.h>
 
 // DONE AND TESTED:
-// - klassenhierarchie aufbauen
-// - isA u.a. vergleiche
-// - in listen einfügen
+// - build class hierarchy
+// - isA, isChildOf, ...
+// - insert into class-lists
+// - ClassIdentifier
 
 // IN WORK:
-// - factory
-// - klassen-identifier
+// - BaseIdentifier
+// - Factory
 
 // TO DO:
-// - durch listen iterieren
-// - searchtree für classname-strings
+// - iterate through lists
+// - searchtree for classname-strings
 
 
@@ -59 +59 @@
 
         public:
-            Identifier(Identifier* identifier) {};
-            ~Identifier();
             void addObject(OrxonoxClass* object);
             void removeObject(OrxonoxClass* object);
@@ -79 +77 @@
         private:
             Identifier();
+            Identifier(const Identifier& identifier) {}
+            virtual ~Identifier();
             void initialize(IdentifierList* parents);
 
@@ -94 +94 @@
 
     // ##### ClassIdentifier #####
-    class A1;
-
     template <class T>
     class ClassIdentifier : public Identifier
@@ -106 +104 @@
         private:
             ClassIdentifier();
+            ClassIdentifier(const ClassIdentifier<T>& identifier) {}
             ~ClassIdentifier();
 
@@ -168 +167 @@
     {
         return new T();
+    }
+
+
+    // ##### BaseIdentifier #####
+    template <class B>
+    class BaseIdentifier// : public Identifier
+    {
+        public:
+            BaseIdentifier();
+
+            template <class T>
+            BaseIdentifier<B>& operator= (ClassIdentifier<T>* identifier)
+            {
+                std::cout << "####### Class(" << identifier->getName() << ")->isA( Class(" << ClassIdentifier<B>::getIdentifier()->getName() << ") ) = " << identifier->isA( ClassIdentifier<B>::getIdentifier() ) << "\n";
+                if (!identifier->isA(ClassIdentifier<B>::getIdentifier()))
+                {
+                    std::cout << "Error: Class " << identifier->getName() << " is not a " << ClassIdentifier<B>::getIdentifier()->getName() << "!\n";
+                    std::cout << "Error: BaseIdentifier<" << ClassIdentifier<B>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden.\n";
+                    std::cout << "Aborting...\n";
+                    abort();
+                }
+                this->identifier_ = identifier;
+                return *this;
+            }
+
+            operator Identifier()
+            {
+                return this->identifier_;
+            }
+
+        private:
+            Identifier* identifier_;
+    };
+
+    template <class B>
+    BaseIdentifier<B>::BaseIdentifier()
+    {
+        this->identifier_ = ClassIdentifier<B>::getIdentifier();
     }
 

code/branches/objecthierarchie/src/orxonox.cc

@@ -123 +123 @@
         test4 = new A3();
 */
-/*
+
         std::cout << "Test 5\n";
         A1* test5_01 = new A1();
@@ -144 +144 @@
         A3B2C2* test5_18 = new A3B2C2();
 
+/*
         OrxonoxClass* test5;
         for (int i = 0; i <= 18; i++)
@@ -434 +435 @@
 */
 
+        std::cout << "Test 7\n";
+        std::cout << "1\n";
+        BaseIdentifier<A1B1> test7_01;
+        test7_01 = Class(A1B1C1);
+
+        BaseIdentifier<A1B1> test7_02;
+        test7_02 = Class(A1B1);
+
+//        std::cout << Identifier(test7_02).getName() << "\n";
+
+/*
+        BaseIdentifier<A1B1> test7_03;
+        test7_03 = Class(A1);
+
+        BaseIdentifier<A1B1> test7_04;
+        test7_04 = Class(A1B2);
+
+        BaseIdentifier<A1B1> test7_05;
+        test7_05 = Class(A2);
+*/
+        std::cout << "2\n";
+
+
       }