Changeset 9223

Timestamp:

May 19, 2012, 11:35:32 AM (12 years ago)

Author:

landauf

Message:

renamed setType<T>() to reset<T>()

Location:

code/branches/testing

Files:

• src/libraries/util/MultiType.h (modified) (5 diffs)
• test/util/MultiTypeTest.cc (modified) (3 diffs)

code/branches/testing/src/libraries/util/MultiType.h

@@ -58 +58 @@
     If you want to change the type, there are three possibilities:
      - @ref orxonox::MultiType::convert "convert<T>()" sets the type to T and converts the currently assigned value
-     - @ref orxonox::MultiType::setType "setType<T>()" sets the type to T and resets the value to zero using zeroise<T>()
+     - @ref orxonox::MultiType::reset "reset<T>()" sets the type to T and resets the value to zero using zeroise<T>()
      - setValue<T>(value) assigns a new value and changes the type to T.
 
@@ -339 +339 @@
                     return this->assignValue     (static_cast<void*>(const_cast<typename Loki::TypeTraits<V>::UnqualifiedType*>(value)));
             }
+            /// Changes the type to T and assigns the new value (which might be of another type than T - it gets converted).
+            template <typename T, typename V> inline bool setValue(const V& value) { this->reset<T>(); return this->setValue(value); }
             /// Assigns the value of the other MultiType and converts it to the current type.
             bool                                          setValue(const MultiType& other) { if (this->value_) { return this->value_->assimilate(other); } else { if (other.value_) { this->value_ = other.value_->clone(); } return true; } }
-            /// Changes the type to T and assigns the new value (which might be of another type than T - it gets converted).
-            template <typename T, typename V> inline bool setValue(const V& value) { this->setType<T>(); return this->setValue(value); }
-
 
             /// Copies the other MultiType by assigning value and type.
@@ -353 +352 @@
             /// Resets value and type. Type will be void afterwards and null() returns true.
             inline void                       reset()                      { if (this->value_) delete this->value_; this->value_ = 0; }
-            /// Current content gets overridden with default zero value
+            /// Resets the value and changes the internal type to T.
+            template <typename T> inline void reset()                      { this->assignValue(typename Loki::TypeTraits<T>::UnqualifiedReferredType()); }
+            /// Current value gets overridden with default zero value
             inline void                       resetValue()                 { if (this->value_) this->value_->reset(); }
-
-            /// Resets the value and changes the internal type to T.
-            template <typename T> inline void setType()                    { this->assignValue(typename Loki::TypeTraits<T>::UnqualifiedReferredType()); }
 
             /// Returns true if the current type is T.
@@ -377 +375 @@
 
             /// Checks if the MT contains no value.
-            bool                              null() const { return (!this->value_); }
+            bool                              null() const { return !this->value_; }
 
             operator char()                  const;
@@ -497 +495 @@
     _UtilExport inline std::ostream& operator<<(std::ostream& outstream, const MultiType& mt) { if (mt.value_) { mt.value_->toString(outstream); } return outstream; }
 
-    template <> inline bool MultiType::isType<void>()                 const { return this->null();                                                       } ///< Returns true if the current type equals the given type.
+    template <> inline bool MultiType::isType<void>()                 const { return this->null();                                                    } ///< Returns true if the current type equals the given type.
     template <> inline bool MultiType::isType<char>()                 const { return (this->value_ && this->value_->type_ == Type::Char);             } ///< Returns true if the current type equals the given type.
     template <> inline bool MultiType::isType<unsigned char>()        const { return (this->value_ && this->value_->type_ == Type::UnsignedChar);     } ///< Returns true if the current type equals the given type.

code/branches/testing/test/util/MultiTypeTest.cc

@@ -18 +18 @@
     // x convert<type>()
     // x reset
+    // x reset<type>()
     // x resetValue
-    // x setType<type>()
 
     // x isType<type>()
@@ -310 +310 @@
     }
 
+    ///////////////////
+    // reset<type>() //
+    ///////////////////
+    TEST(MultiType, SetType)
+    {
+        MultiType mt(10);
+
+        EXPECT_TRUE(mt.isType<int>());
+        EXPECT_FALSE(mt.isType<float>());
+        EXPECT_EQ(10, mt.getInt());
+
+        mt.reset<float>();
+
+        EXPECT_FALSE(mt.isType<int>());
+        EXPECT_TRUE(mt.isType<float>());
+        EXPECT_EQ(0, mt.getInt());
+    }
+
     ////////////////
     // resetValue //
@@ -323 +341 @@
 
         EXPECT_TRUE(mt.isType<int>());
-        EXPECT_EQ(0, mt.getInt());
-    }
-
-    /////////////////////
-    // setType<type>() //
-    /////////////////////
-    TEST(MultiType, SetType)
-    {
-        MultiType mt(10);
-
-        EXPECT_TRUE(mt.isType<int>());
-        EXPECT_FALSE(mt.isType<float>());
-        EXPECT_EQ(10, mt.getInt());
-
-        mt.setType<float>();
-
-        EXPECT_FALSE(mt.isType<int>());
-        EXPECT_TRUE(mt.isType<float>());
         EXPECT_EQ(0, mt.getInt());
     }