Changeset 808

Timestamp:

Feb 12, 2008, 9:26:58 PM (16 years ago)

Author:

landauf

Message:

Fixed a small bug in the clean-function of ClassTreeMask (I made it recursively and forgot the recursion-call ). From what I see now the ClassTreeMask works fine. And yes, I know it's overkill, no one will ever use more than 10% of the features, but I like it.

Location:

code/branches/core/src/orxonox

Files:

• Orxonox.cc (modified) (2 diffs)
• core/ClassTreeMask.cc (modified) (1 diff)

code/branches/core/src/orxonox/Orxonox.cc

@@ -925 +925 @@
         std::cout << "Mask 1 ^ Mask 2:\n";
         TestClassTreeMask(test13_10);
-        test13_10 = test13_10;
-        TestClassTreeMask(test13_10);
 
         std::cout << "8\n";
@@ -962 +960 @@
         TestClassTreeMask(test13_11);
         TestClassTreeMask(test13_13);
+
+        test13_1 = test13_1;
+        std::cout << std::endl;
+        std::cout << "Mask 1 assigned with = operator to itself:\n";
+        TestClassTreeMask(test13_1);
 
         std::cout << "9\n";

code/branches/core/src/orxonox/core/ClassTreeMask.cc

@@ -278 +278 @@
     void ClassTreeMask::clean(ClassTreeMaskNode* node)
     {
+//std::cout << "4_1: " << node->getClass()->getName() << ": " << node->isIncluded() << "\n";
         for (std::list<ClassTreeMaskNode*>::iterator it = node->subnodes_.begin(); it != node->subnodes_.end(); )
         {
+//std::cout << "4_2: " << (*it)->getClass()->getName() << ": " << (*it)->isIncluded() << "\n";
+            this->clean(*it);
+//std::cout << "4_3\n";
             if ((*it)->isIncluded() == node->isIncluded())
             {
+//std::cout << "4_4\n";
                 node->subnodes_.insert(node->subnodes_.end(), (*it)->subnodes_.begin(), (*it)->subnodes_.end());
                 (*it)->subnodes_.clear();
                 node->subnodes_.erase(it);
                 it = node->subnodes_.begin();
+//std::cout << "4_5\n";
             }
             else
             {
+//std::cout << "4_6\n";
                 ++it;
             }
         }
+//std::cout << "4_7\n";
     }