Changeset 807 for code/branches/core/src/orxonox/core/ClassTreeMask.h

Timestamp:

Feb 12, 2008, 8:36:19 PM (16 years ago)

Author:

landauf

Message:

• fixed a small bug in ClassTreeMask
• added more operators to ClassTreeMask
• added testing code for ClassTreeMask

File:

• code/branches/core/src/orxonox/core/ClassTreeMask.h (modified) (4 diffs)

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

@@ -77 +77 @@
         private:
             std::stack<std::pair<std::list<ClassTreeMaskNode*>::iterator, std::list<ClassTreeMaskNode*>::iterator> > nodes_;
+            std::list<ClassTreeMaskNode*> rootlist_;
     };
 
@@ -83 +84 @@
         public:
             ClassTreeMask();
+            ClassTreeMask(const ClassTreeMask& other);
             ~ClassTreeMask();
 
@@ -94 +96 @@
             bool isExcluded(const Identifier* subclass) const;
 
+            ClassTreeMask& operator=(const ClassTreeMask& other);
+
+            ClassTreeMask& operator+();
+            ClassTreeMask operator-() const;
+
             ClassTreeMask operator+(const ClassTreeMask& other) const;
             ClassTreeMask operator*(const ClassTreeMask& other) const;
+            ClassTreeMask operator-(const ClassTreeMask& other) const;
             ClassTreeMask operator!() const;
-            ClassTreeMask operator-(const ClassTreeMask& other) const;
+
+            ClassTreeMask& operator+=(const ClassTreeMask& other);
+            ClassTreeMask& operator*=(const ClassTreeMask& other);
+            ClassTreeMask& operator-=(const ClassTreeMask& other);
 
             ClassTreeMask operator&(const ClassTreeMask& other) const;
@@ -103 +114 @@
             ClassTreeMask operator^(const ClassTreeMask& other) const;
             ClassTreeMask operator~() const;
+
+            ClassTreeMask& operator&=(const ClassTreeMask& other);
+            ClassTreeMask& operator|=(const ClassTreeMask& other);
+            ClassTreeMask& operator^=(const ClassTreeMask& other);
+
+            friend std::ostream& operator<<(std::ostream& out, const ClassTreeMask& mask);
 
         private: