Changeset 896

Timestamp:

Mar 17, 2008, 5:05:54 PM (17 years ago)

Author:

landauf

Message:

• added == and != operator to the ClassTreeMask
• Included the Namespace in the Loader

Location:

code/branches/core2/src/orxonox/core

Files:

• ClassTreeMask.cc (modified) (1 diff)
• ClassTreeMask.h (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• Namespace.cc (modified) (2 diffs)
• Namespace.h (modified) (1 diff)

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

@@ -561 +561 @@
 
     /**
+        @brief Compares the mask with another mask and returns true if they represent the same logic.
+        @param other The other mask
+        @return True if both masks represent the same logic
+    */
+    bool ClassTreeMask::operator==(const ClassTreeMask& other) const
+    {
+        ClassTreeMask temp1 = other;
+        ClassTreeMask temp2 = (*this);
+
+        temp1.clean();
+        temp2.clean();
+
+        ClassTreeMaskIterator it1 = temp1.root_;
+        ClassTreeMaskIterator it2 = temp2.root_;
+
+        for ( ; it1 && it2; ++it1, ++it2)
+            if (it1->getClass() != it2->getClass())
+                return false;
+
+        return true;
+    }
+
+    /**
+        @brief Compares the mask with another mask and returns true if they represent different logics.
+        @param other The other mask
+        @return True if the masks represent different logics
+    */
+    bool ClassTreeMask::operator!=(const ClassTreeMask& other) const
+    {
+        return (!((*this) == other));
+    }
+
+    /**
         @brief Prefix operator + does nothing.
         @return A reference to the mask itself

code/branches/core2/src/orxonox/core/ClassTreeMask.h

@@ -179 +179 @@
             ClassTreeMask& operator=(const ClassTreeMask& other);
 
+            bool operator==(const ClassTreeMask& other) const;
+            bool operator!=(const ClassTreeMask& other) const;
+
             ClassTreeMask& operator+();
             ClassTreeMask operator-() const;

code/branches/core2/src/orxonox/core/Loader.cc

@@ -115 +115 @@
             ticpp::Document xmlfile(level->getFile());
             xmlfile.LoadFile();
+            ticpp::Element rootElement;
+            rootElement.SetAttribute("name", "rootNamespace");
 
             for (ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++)
-            {
-                Identifier* identifier = ID(child->Value());
-                if (identifier)
-                {
-                    if (identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier))
-                    {
-                        COUT(4) << "  fabricating " << child->Value() << "..." << std::endl;
-                        BaseObject* newObject = identifier->fabricate();
-                        newObject->setLoaderIndentation("    ");
-                        newObject->setLevel(level);
-                        newObject->XMLPort(*child, true);
-                        COUT(5) << "  ...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
-                    }
-                }
-                else
-                {
-                    COUT(2) << "  Warning: '" << child->Value() << "' is not a valid classname." << std::endl;
-                }
-            }
+                rootElement.InsertEndChild(*child);
+
+            Namespace* rootNamespace = new Namespace();
+            rootNamespace->setLoaderIndentation("    ");
+            rootNamespace->setLevel(level);
+            rootNamespace->deleteNamespaceNodesAfterDestruction(true);
+            rootNamespace->XMLPort(rootElement, true);
 
             COUT(0) << "Finished loading " << level->getFile() << "." << std::endl;

code/branches/core2/src/orxonox/core/Namespace.cc

@@ -41 +41 @@
 
         this->bAutogeneratedFileRootNamespace_ = false;
+        this->bDeleteNamespaceNodesAfterDestruction_ = false;
         this->operator_ = "or";
     }
@@ -46 +47 @@
     Namespace::~Namespace()
     {
+        if (this->bDeleteNamespaceNodesAfterDestruction_)
+            for (std::set<NamespaceNode*>::iterator it = this->representingNamespaces_.begin(); it != this->representingNamespaces_.end(); ++it)
+                delete (*it);
     }
 

code/branches/core2/src/orxonox/core/Namespace.h

@@ -62 +62 @@
             bool isIncludedIn(const Namespace* ns) const { return ns->includes(this); }
 
+            void deleteNamespaceNodesAfterDestruction(bool bDelete)
+                { this->bDeleteNamespaceNodesAfterDestruction_ = bDelete; }
+
         private:
             std::set<NamespaceNode*> representingNamespaces_;
             bool bAutogeneratedFileRootNamespace_;
+            bool bDeleteNamespaceNodesAfterDestruction_;
             std::string operator_;
     };