Changeset 225 for code/branches/objecthierarchie/src

Timestamp:

Nov 20, 2007, 8:47:13 PM (17 years ago)

Author:

landauf

Message:

added ++it operator to the Iterator (because its faster than it++)

Location:

code/branches/objecthierarchie/src

Files:

• Iterator.h (modified) (4 diffs)
• orxonox.cc (modified) (5 diffs)

code/branches/objecthierarchie/src/Iterator.h

@@ -28 +28 @@
             }
 
+            Iterator<T> operator++()
+            {
+                this->elementForwards_ = this->elementForwards_->next_;
+                return *this;
+            }
+
             Iterator<T> operator--(int step)
             {
@@ -44 +50 @@
                         this->elementBackwards_ = this->elementBackwards_->prev_;
                 }
+            }
 
-                return copy;
+            Iterator<T> operator--()
+            {
+                if (this->iteratingForwards_)
+                    this->iteratingForwards_ = false;
+                else
+                    this->elementBackwards_ = this->elementBackwards_->prev_;
+
+                return *this;
             }
 
@@ -51 +65 @@
             {
                 if (this->iteratingForwards_)
-                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
+                    return this->elementForwards_->object_;
                 else
-                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
+                    return this->elementBackwards_->object_;
             }
 
@@ -59 +73 @@
             {
                 if (this->iteratingForwards_)
-                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
+                    return this->elementForwards_->object_;
                 else
-                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
+                    return this->elementBackwards_->object_;
 
             }

code/branches/objecthierarchie/src/orxonox.cc

@@ -543 +543 @@
         std::cout << "1\n";
         int count = 0;
-        for (Iterator<BaseObject> it; it != 0; it++)
+        for (Iterator<BaseObject> it; it != 0; ++it)
             count++;
         std::cout << "Anzahl BaseObjects: " << count << "\n";
 
         count = 0;
-        for (Iterator<A1> it; it != 0; it++)
+        for (Iterator<A1> it; it != 0; ++it)
             count++;
         std::cout << "Anzahl A1: " << count << "\n";
 
         count = 0;
-        for (Iterator<A1B1> it; it; it++)
+        for (Iterator<A1B1> it; it; ++it)
             count++;
         std::cout << "Anzahl A1B1: " << count << "\n";
 
         count = 0;
-        for (Iterator<A1B1C1> it; it; it++)
+        for (Iterator<A1B1C1> it; it; ++it)
             count++;
         std::cout << "Anzahl A1B1C1: " << count << "\n";
 
         count = 0;
-        for (Iterator<A2> it; it; it++)
+        for (Iterator<A2> it; it; ++it)
             count++;
         std::cout << "Anzahl A2: " << count << "\n";
@@ -585 +585 @@
         }
 
-        for (Iterator<A2B1C1> it; it; it++)
+        for (Iterator<A2B1C1> it; it; ++it)
             std::cout << "Name: " << it->name_ << "\n";
 
         std::cout << "3\n";
-        for (Iterator<A2B1C1> it; it; it--)
+        for (Iterator<A2B1C1> it; it; --it)
             std::cout << "Name: " << it->name_ << "\n";
 
@@ -596 +596 @@
 
         std::cout << "5\n";
-        for (Iterator<A2B1C1> it; it; it++)
+        for (Iterator<A2B1C1> it; it; ++it)
             std::cout << "Name: " << it->name_ << "\n";
 
         std::cout << "6\n";
-        for (Iterator<A2B1C1> it; it; it--)
+        for (Iterator<A2B1C1> it; it; --it)
             std::cout << "Name: " << it->name_ << "\n";
 
@@ -607 +607 @@
 
         std::cout << "8\n";
-        for (Iterator<A2B1C1> it; it; it++)
+        for (Iterator<A2B1C1> it; it; ++it)
             std::cout << "Name: " << it->name_ << "\n";
 
         std::cout << "9\n";
-        for (Iterator<A2B1C1> it; it; it--)
+        for (Iterator<A2B1C1> it; it; --it)
             std::cout << "Name: " << it->name_ << "\n";
 
@@ -618 +618 @@
 
         std::cout << "11\n";
-        for (Iterator<A2B1C1> it; it; it++)
+        for (Iterator<A2B1C1> it; it; ++it)
             std::cout << "Name: " << it->name_ << "\n";
 
         std::cout << "12\n";
-        for (Iterator<A2B1C1> it; it; it--)
+        for (Iterator<A2B1C1> it; it; --it)
             std::cout << "Name: " << it->name_ << "\n";