Changeset 9730 in orxonox.OLD for branches/new_class_id/src/lib/util/executor

Timestamp:

Sep 15, 2006, 12:09:12 PM (18 years ago)

Author:

bensch

Message:

cleaner executor with evaluate function, that will be made an Object Soon.

Location:

branches/new_class_id/src/lib/util/executor

Files:

• executor.cc (modified) (2 diffs)
• executor.h (modified) (3 diffs)
• executor_functional.cc (modified) (2 diffs)
• executor_functional.h (modified) (8 diffs)

branches/new_class_id/src/lib/util/executor/executor.cc

@@ -61 +61 @@
       break;
     }
+    else
+      this->defaultValue[i].storeString();
   }
 }
@@ -106 +108 @@
     {
       this->defaultValue[i].setValueOf(*value[i]);
+      this->defaultValue[i].storeString();
     }
   }

branches/new_class_id/src/lib/util/executor/executor.h

@@ -15 +15 @@
 //! an enumerator for the definition of the Type.
 typedef enum {
-  Executor_Objective         = 1,
-  Executor_Static            = 2,
+  Executor_Objective,
+  Executor_Static,
 } Executor_Type;
 
@@ -51 +51 @@
   inline MultiType& getDefaultValue(unsigned int i) { return defaultValue[i]; };
 
-  // EXECUTE
-  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
-  //     virtual void operator()(BaseObject* object, int& count, void* values) const = 0;
-  /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-  //     virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const = 0;
-
   // RETRIEVE INFORMATION
   /** @returns the Type of this Function (either static or objective) */
-  inline long getType() const { return this->functorType; };
+  inline Executor_Type getType() const { return this->functorType; };
+
   /** @returns the Count of Parameters this Executor takes */
   inline unsigned int getParamCount() const { return this->paramCount; };
@@ -84 +79 @@
 
 protected:
-  short                       functorType;      //!< The type of Function we've got (either static or objective).
+  Executor_Type               functorType;      //!< The type of Function we've got (either static or objective).
   unsigned int                paramCount;       //!< the count of parameters.
   MultiType                   defaultValue[7];  //!< Default Values.
 
-  bool                        bRetVal;          //!< True if the Executor has a return Value.
+  const bool                  bRetVal;          //!< True if the Executor has a return Value.
 };
 

branches/new_class_id/src/lib/util/executor/executor_functional.cc

@@ -15 +15 @@
 
 #include "executor_functional.h"
-std::string ExecutorFunctional_returningString_from[7];
-
 
 template<> bool fromString<bool>(const std::string& input, bool defaultValue) { return isBool(input, defaultValue); };
@@ -39 +37 @@
 template<> float getDefault<float>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getFloat(); };
 template<> char getDefault<char>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getChar(); };
-template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i) { return ExecutorFunctional_returningString_from[i] = defaultValues[i].getString(); };
+template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getStoredString(); };
 
 

branches/new_class_id/src/lib/util/executor/executor_functional.h

@@ -51 +51 @@
 template<> char getDefault<char>(const MultiType* const defaultValues, unsigned int i);
 template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i);
+
+
+/**
+ * @brief to remove writing errors, this function is Used.
+ * @param sub The SubString to use
+ * @param default The default Values.
+ */
+template<typename type, int index> type Evaluate(const SubString& sub, const MultiType* const defaults)
+{
+  return (sub.size() > index) ?
+      fromString<type>(sub[index], getDefault<type>(defaults, index)) :
+      fromMulti<type>(defaults[index]);
+};
+
 
 #endif /* __EXECUTOR_FUNCTIONAL_H_ */
@@ -80 +94 @@
  #endif
 
-  #ifdef __EXECUTOR_FUNCTIONAL_STATIC_INCLUDED
+#ifdef __EXECUTOR_FUNCTIONAL_STATIC_INCLUDED
    #define __EXECUTOR_FUNCTIONAL_NOT_INCLUDE_THIS
   #else
@@ -103 +117 @@
 
 #ifndef __EXECUTOR_FUNCTIONAL_NOT_INCLUDE_THIS
+
 ///////////
 //// 0 ////
@@ -177 +192 @@
   {
     (__EXECUTOR_FUNCTIONAL_FUNCTION_EXEC)(
-      (sub.size() > 0) ? fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) : (fromMulti<type0>(this->defaultValue[0])));
+      Evaluate<type0, 0>(sub, this->defaultValue));
   };
 
@@ -220 +235 @@
   {
     (__EXECUTOR_FUNCTIONAL_FUNCTION_EXEC)(
-      (sub.size() > 0) ? fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) : (fromMulti<type0>(this->defaultValue[0])),
-      (sub.size() > 1) ? fromString<type1>(sub[1], getDefault<type1>(this->defaultValue, 1)) : (fromMulti<type1>(this->defaultValue[1])));
+      Evaluate<type0, 0>(sub, this->defaultValue),
+      Evaluate<type1, 1>(sub, this->defaultValue));
   };
 
@@ -265 +280 @@
   {
     (__EXECUTOR_FUNCTIONAL_FUNCTION_EXEC)(
-      (sub.size() > 0) ? fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) : (fromMulti<type0>(this->defaultValue[0])),
-      (sub.size() > 1) ? fromString<type1>(sub[1], getDefault<type1>(this->defaultValue, 1)) : (fromMulti<type1>(this->defaultValue[1])),
-      (sub.size() > 2) ? fromString<type2>(sub[2], getDefault<type2>(this->defaultValue, 2)) : (fromMulti<type2>(this->defaultValue[2])));
+      Evaluate<type0, 0>(sub, this->defaultValue),
+      Evaluate<type1, 1>(sub, this->defaultValue),
+      Evaluate<type2, 2>(sub, this->defaultValue));
   };
 
@@ -312 +327 @@
   {
     (__EXECUTOR_FUNCTIONAL_FUNCTION_EXEC)(
-      (sub.size() > 0) ? fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) : (fromMulti<type0>(this->defaultValue[0])),
-      (sub.size() > 1) ? fromString<type1>(sub[1], getDefault<type1>(this->defaultValue, 1)) : (fromMulti<type1>(this->defaultValue[1])),
-      (sub.size() > 2) ? fromString<type2>(sub[2], getDefault<type2>(this->defaultValue, 2)) : (fromMulti<type2>(this->defaultValue[2])),
-      (sub.size() > 3) ? fromString<type3>(sub[3], getDefault<type3>(this->defaultValue, 3)) : (fromMulti<type3>(this->defaultValue[3])));
+      Evaluate<type0, 0>(sub, this->defaultValue),
+      Evaluate<type1, 1>(sub, this->defaultValue),
+      Evaluate<type2, 2>(sub, this->defaultValue),
+      Evaluate<type3, 3>(sub, this->defaultValue));
   };
 
@@ -360 +375 @@
   {
     (__EXECUTOR_FUNCTIONAL_FUNCTION_EXEC)(
-      (sub.size() > 0) ? fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) : (fromMulti<type0>(this->defaultValue[0])),
-      (sub.size() > 1) ? fromString<type1>(sub[1], getDefault<type1>(this->defaultValue, 1)) : (fromMulti<type1>(this->defaultValue[1])),
-      (sub.size() > 2) ? fromString<type2>(sub[2], getDefault<type2>(this->defaultValue, 2)) : (fromMulti<type2>(this->defaultValue[2])),
-      (sub.size() > 3) ? fromString<type3>(sub[3], getDefault<type3>(this->defaultValue, 3)) : (fromMulti<type3>(this->defaultValue[3])),
-      (sub.size() > 4) ? fromString<type4>(sub[4], getDefault<type4>(this->defaultValue, 4)) : (fromMulti<type4>(this->defaultValue[4])));
+      Evaluate<type0, 0>(sub, this->defaultValue),
+      Evaluate<type1, 1>(sub, this->defaultValue),
+      Evaluate<type2, 2>(sub, this->defaultValue),
+      Evaluate<type3, 3>(sub, this->defaultValue),
+      Evaluate<type4, 4>(sub, this->defaultValue));
   };