Changeset 246 for code/branches/objecthierarchie/src/orxonox.cc

Timestamp:

Nov 25, 2007, 7:19:54 PM (16 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.

File:

• code/branches/objecthierarchie/src/orxonox.cc (modified) (7 diffs)

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";