Changeset 246 for code/branches/objecthierarchie/src

Timestamp:

Nov 25, 2007, 7:19:54 PM (17 years ago)

Author:

landauf

Message:

added "MetaObjectList", containing the list-element of the ObjectList of all classes an object is registered in. this allowes much faster deleting of objects.

Location:

code/branches/objecthierarchie/src

Files:

• BaseObject.cc (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• Identifier.h (modified) (4 diffs)
• IdentifierIncludes.h (modified) (2 diffs)
• MetaObjectList.cc (added)
• MetaObjectList.h (added)
• ObjectList.h (modified) (3 diffs)
• OrxonoxClass.cc (modified) (2 diffs)
• OrxonoxClass.h (modified) (2 diffs)
• orxonox.cc (modified) (7 diffs)

code/branches/objecthierarchie/src/BaseObject.cc

@@ -12 +12 @@
     BaseObject::~BaseObject()
     {
-        UnregisterObject();
     }
 }

code/branches/objecthierarchie/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES orxonox.cc IdentifierList.cc Identifier.cc Factory.cc OrxonoxClass.cc BaseObject.cc test1.cc test2.cc test3.cc)
-SET(INC_FILES IdentifierIncludes.h Identifier.h Factory.h ClassFactory.h IdentifierList.h ObjectList.h Iterator.h OrxonoxClass.h BaseObject.h Test.h test1.h test2.h test3.h)
+SET(SRC_FILES orxonox.cc IdentifierList.cc Identifier.cc MetaObjectList.cc Factory.cc OrxonoxClass.cc BaseObject.cc test1.cc test2.cc test3.cc)
+SET(INC_FILES IdentifierIncludes.h Identifier.h Factory.h ClassFactory.h IdentifierList.h ObjectList.h MetaObjectList.h Iterator.h OrxonoxClass.h BaseObject.h Test.h test1.h test2.h test3.h)
 
 #Creates an executable

code/branches/objecthierarchie/src/Identifier.h

@@ -8 +8 @@
 #include "Factory.h"
 
-#define HIERARCHY_VERBOSE true
+#define HIERARCHY_VERBOSE false
 
 
@@ -30 +30 @@
 
         public:
-            virtual void removeObject(OrxonoxClass* object) const = 0;
-            virtual void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const = 0;
-
             inline void addFactory(BaseFactory* factory) { this->factory_ = factory; }
             BaseObject* fabricate();
@@ -93 +90 @@
             static ClassIdentifier<T>* getIdentifier();
             static void addObject(T* object);
-            void removeObject(OrxonoxClass* object) const;
-            void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const;
 
         private:
@@ -172 +167 @@
         std::cout << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
 #endif
-        ClassIdentifier<T>::getIdentifier()->objects_->add(object);
-    }
-
-    template <class T>
-    void ClassIdentifier<T>::removeObject(OrxonoxClass* object) const
-    {
-        bool bIterateForwards = !Identifier::isCreatingHierarchy();
-
-        this->removeObjectIntern(object, bIterateForwards);
-
-        IdentifierListElement* temp = this->parents_.first_;
-        while (temp)
-        {
-            temp->identifier_->removeObjectIntern(object, bIterateForwards);
-            temp = temp->next_;
-        }
-    }
-
-    template <class T>
-    void ClassIdentifier<T>::removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const
-    {
-#if HIERARCHY_VERBOSE
-        if (bIterateForwards)
-            std::cout << "*** Removed object from " << this->name_ << "-list, iterating forwards.\n";
-        else
-            std::cout << "*** Removed object from " << this->name_ << "-list, iterating backwards.\n";
-#endif
-
-        this->objects_->remove(object, bIterateForwards);
+        object->getMetaList()->add(ClassIdentifier<T>::getIdentifier()->objects_, ClassIdentifier<T>::getIdentifier()->objects_->add(object));
     }
 

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -2 +2 @@
 #include "Factory.h"
 #include "ClassFactory.h"
-#include "IdentifierList.h"
-#include "ObjectList.h"
+//#include "IdentifierList.h"
+//#include "ObjectList.h"
 #include "Iterator.h"
 #include "OrxonoxClass.h"
@@ -37 +37 @@
 #endif
 
-#define UnregisterObject() \
-    this->getIdentifier()->removeObject(this)
-
 #define Class(ClassName) \
     ClassIdentifier<ClassName>::getIdentifier()

code/branches/objecthierarchie/src/ObjectList.h

@@ -44 +44 @@
             ObjectList();
             ~ObjectList();
-            void add(T* object);
+            ObjectListElement<T>* add(T* object);
             void remove(OrxonoxClass* object, bool bIterateForwards = true);
 
@@ -71 +71 @@
 
     template <class T>
-    void ObjectList<T>::add(T* object)
+    ObjectListElement<T>* ObjectList<T>::add(T* object)
     {
         if (!this->last_)
@@ -85 +85 @@
             temp->next_ = this->last_;
         }
+
+        return this->last_;
     }
 

code/branches/objecthierarchie/src/OrxonoxClass.cc

@@ -7 +7 @@
         this->identifier_ = 0;
         this->parents_ = 0;
+
+        this->metaList_ = new MetaObjectList;
     }
 
@@ -13 +15 @@
         if (this->parents_)
             delete this->parents_;
+
+        delete this->metaList_;
     }
 }

code/branches/objecthierarchie/src/OrxonoxClass.h

@@ -4 +4 @@
 #include "Identifier.h"
 #include "IdentifierList.h"
+#include "ObjectList.h"
+#include "MetaObjectList.h"
 
 namespace orxonox
@@ -12 +14 @@
             OrxonoxClass();
             virtual ~OrxonoxClass();
-            Identifier* getIdentifier() const { return this->identifier_; }
-            void setIdentifier(Identifier* identifier) { this->identifier_ = identifier; }
-            IdentifierList* getParents() const { return this->parents_; }
-            void setParents(IdentifierList* parents) { this->parents_ = parents; }
+            inline Identifier* getIdentifier() const { return this->identifier_; }
+            inline void setIdentifier(Identifier* identifier) { this->identifier_ = identifier; }
+            inline IdentifierList* getParents() const { return this->parents_; }
+            inline void setParents(IdentifierList* parents) { this->parents_ = parents; }
+            inline MetaObjectList* getMetaList() { return this->metaList_; }
 
         private:
             Identifier* identifier_;
             IdentifierList* parents_;
+            MetaObjectList* metaList_;
     };
 }

code/branches/objecthierarchie/src/orxonox.cc

@@ -407 +407 @@
         delete test8_02;
         delete test8_03;
-*/
-/*
+
+
         std::cout << "Test 9\n";
         std::cout << "1\n";
@@ -441 +441 @@
         Identifier* test10_03 = Class(A3B1C1);
 
-
         BaseObject* test10_04 = test10_01->fabricate();
         BaseObject* test10_05 = test10_02->fabricate();
@@ -451 +450 @@
 
         std::cout << "1\n";
-        int count = 0;
-        for (Iterator<BaseObject> it; it != 0; ++it)
-            count++;
+        int count;
+        count = 0; for (Iterator<BaseObject> it; it != 0; ++it) { count++; }
         std::cout << "Anzahl BaseObjects: " << count << "\n";
-
-        count = 0;
-        for (Iterator<A1> it; it != 0; ++it)
-            count++;
+        count = 0; for (Iterator<A1> it; it != 0; ++it) { count++; }
         std::cout << "Anzahl A1: " << count << "\n";
-
-        count = 0;
-        for (Iterator<A1B1> it; it; ++it)
-            count++;
+        count = 0; for (Iterator<A1B1> it; it; ++it) { count++; }
         std::cout << "Anzahl A1B1: " << count << "\n";
-
-        count = 0;
-        for (Iterator<A1B1C1> it; it; ++it)
-            count++;
+        count = 0; for (Iterator<A1B1C1> it; it; ++it) { count++; }
         std::cout << "Anzahl A1B1C1: " << count << "\n";
-
-        count = 0;
-        for (Iterator<A2> it; it; ++it)
-            count++;
+        count = 0; for (Iterator<A2> it; it; ++it) { count++; }
         std::cout << "Anzahl A2: " << count << "\n";
-
 
         std::cout << "2\n";
@@ -494 +479 @@
         }
 
+        count = 0; for (Iterator<BaseObject> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl BaseObjects: " << count << "\n";
+        count = 0; for (Iterator<A1> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl A1: " << count << "\n";
+        count = 0; for (Iterator<A1B1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1: " << count << "\n";
+        count = 0; for (Iterator<A1B1C1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1C1: " << count << "\n";
+        count = 0; for (Iterator<A2> it; it; ++it) { count++; }
+        std::cout << "Anzahl A2: " << count << "\n";
+
         for (Iterator<A2B1C1> it; it; ++it)
             std::cout << "Name: " << it->name_ << "\n";
@@ -504 +500 @@
         delete test10_08;
 
+        count = 0; for (Iterator<BaseObject> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl BaseObjects: " << count << "\n";
+        count = 0; for (Iterator<A1> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl A1: " << count << "\n";
+        count = 0; for (Iterator<A1B1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1: " << count << "\n";
+        count = 0; for (Iterator<A1B1C1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1C1: " << count << "\n";
+        count = 0; for (Iterator<A2> it; it; ++it) { count++; }
+        std::cout << "Anzahl A2: " << count << "\n";
+
         std::cout << "5\n";
         for (Iterator<A2B1C1> it; it; ++it)
@@ -515 +522 @@
         delete test10_09;
 
+        count = 0; for (Iterator<BaseObject> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl BaseObjects: " << count << "\n";
+        count = 0; for (Iterator<A1> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl A1: " << count << "\n";
+        count = 0; for (Iterator<A1B1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1: " << count << "\n";
+        count = 0; for (Iterator<A1B1C1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1C1: " << count << "\n";
+        count = 0; for (Iterator<A2> it; it; ++it) { count++; }
+        std::cout << "Anzahl A2: " << count << "\n";
+
         std::cout << "8\n";
         for (Iterator<A2B1C1> it; it; ++it)
@@ -525 +543 @@
         std::cout << "10\n";
         delete test10_10;
+
+        count = 0; for (Iterator<BaseObject> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl BaseObjects: " << count << "\n";
+        count = 0; for (Iterator<A1> it; it != 0; ++it) { count++; }
+        std::cout << "Anzahl A1: " << count << "\n";
+        count = 0; for (Iterator<A1B1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1: " << count << "\n";
+        count = 0; for (Iterator<A1B1C1> it; it; ++it) { count++; }
+        std::cout << "Anzahl A1B1C1: " << count << "\n";
+        count = 0; for (Iterator<A2> it; it; ++it) { count++; }
+        std::cout << "Anzahl A2: " << count << "\n";
 
         std::cout << "11\n";