Changeset 8331

Timestamp:

Apr 26, 2011, 2:50:03 AM (13 years ago)

Author:

rgrieder

Message:

Converted ExprParser to use float instead of double.

Location:

code/branches/kicklib2/src/libraries/util

Files:

• ExprParser.cc (modified) (16 diffs)
• ExprParser.h (modified) (2 diffs)

code/branches/kicklib2/src/libraries/util/ExprParser.cc

@@ -52 +52 @@
     {
         this->failed_ = false;
-        this->variables_["pi"] = math::pi_d;
-        this->variables_["e"] = math::e_d;
-    }
-
-    void ExprParser::setVariable(const std::string& varname, double value)
+        this->variables_["pi"] = math::pi;
+        this->variables_["e"] = math::e;
+    }
+
+    void ExprParser::setVariable(const std::string& varname, float value)
     {
         this->variables_[varname] = value;
@@ -78 +78 @@
     //Private functions:
     /******************/
-    double ExprParser::parse_argument()
-    {
-        double value = parse_expr_8();
+    float ExprParser::parse_argument()
+    {
+        float value = parse_expr_8();
         if (*reading_stream == ',')
         {
@@ -93 +93 @@
     }
 
-    double ExprParser::parse_last_argument()
-    {
-        double value = parse_expr_8();
+    float ExprParser::parse_last_argument()
+    {
+        float value = parse_expr_8();
         if (*reading_stream == ')')
         {
@@ -108 +108 @@
     }
 
-    double ExprParser::parse_expr_8()
-    {
-        double value = parse_expr_7();
+    float ExprParser::parse_expr_8()
+    {
+        float value = parse_expr_7();
         for(;;)
         {
@@ -124 +124 @@
 
 
-    double ExprParser::parse_expr_7()
-    {
-        double value = parse_expr_6();
+    float ExprParser::parse_expr_7()
+    {
+        float value = parse_expr_6();
         for(;;)
         {
@@ -139 +139 @@
     }
 
-    double ExprParser::parse_expr_6()
-    {
-        double value = parse_expr_5();
+    float ExprParser::parse_expr_6()
+    {
+        float value = parse_expr_5();
         for(;;)
         {
@@ -158 +158 @@
     }
 
-    double ExprParser::parse_expr_5()
-    {
-        double value = parse_expr_4();
+    float ExprParser::parse_expr_5()
+    {
+        float value = parse_expr_4();
         for(;;)
         {
@@ -183 +183 @@
     }
 
-    double ExprParser::parse_expr_4()
-    {
-        double value = parse_expr_3();
+    float ExprParser::parse_expr_4()
+    {
+        float value = parse_expr_3();
         for(;;)
         {
@@ -202 +202 @@
     }
 
-    double ExprParser::parse_expr_3()
-    {
-        double value = parse_expr_2();
+    float ExprParser::parse_expr_3()
+    {
+        float value = parse_expr_2();
         for(;;)
         {
@@ -217 +217 @@
             case modulo:
                 {
-                    double temp = parse_expr_2();
+                    float temp = parse_expr_2();
                     value = value - floor(value/temp)*temp;
                     break;
@@ -227 +227 @@
     }
 
-    double ExprParser::parse_expr_2()
-    {
-        double value = parse_expr_1();
+    float ExprParser::parse_expr_2()
+    {
+        float value = parse_expr_1();
         while (*reading_stream != '\0')
         {
@@ -246 +246 @@
     }
 
-    double ExprParser::parse_expr_1()
+    float ExprParser::parse_expr_1()
     {
         PARSE_BLANKS;
-        double value;
+        float value;
 
         unary_operator op = parse_unary_operator();
@@ -262 +262 @@
         else if ((*reading_stream > 47 && *reading_stream < 59) || *reading_stream == 46)
         {  // number
-            value = strtod(reading_stream, const_cast<char**>(&reading_stream));
+            value = (float)strtod(reading_stream, const_cast<char**>(&reading_stream));
         }
         else if ((*reading_stream > 64 && *reading_stream < 91) || (*reading_stream > 96 && *reading_stream < 123) || *reading_stream == 46)
@@ -306 +306 @@
                 {
                     value = parse_last_argument();
-                    value = 0.5*log((value + 1)/(value - 1));
+                    value = 0.5f*log((value + 1.0f)/(value - 1.0f));
                 }
                 CASE("int")
@@ -325 +325 @@
                 {
                     value = parse_last_argument();
-                    value = (value>0 ? 1 : (value<0 ? -1 : 0));
+                    value = (value>0.0f ? 1.0f : (value<0.0f ? -1.0f : 0.0f));
                 }
                 CASE("sqrt")
                     value = sqrt(parse_last_argument());
                 CASE("degrees")
-                    value = parse_last_argument()*180/math::pi_d;
+                    value = parse_last_argument()*180.0f/math::pi;
                 CASE("radians")
-                    value = parse_last_argument()*math::pi_d/180;
+                    value = parse_last_argument()*math::pi/180.0f;
                 CASE("mod")
                 {
                     value = parse_argument();
-                    double value2 = parse_last_argument();
+                    float value2 = parse_last_argument();
                     value = value - floor(value/value2)*value2;
                 }
@@ -356 +356 @@
             else
             {
-                std::map<std::string, double>::const_iterator it = this->variables_.find(word);
+                std::map<std::string, float>::const_iterator it = this->variables_.find(word);
                 if (it != this->variables_.end())
                     value = it->second;

code/branches/kicklib2/src/libraries/util/ExprParser.h

@@ -57 +57 @@
                 COUT(2) << "Warning: Expression could not be parsed to the end! Remains: '" << expr.getRemains() << '\'' << std::endl;
             }
-            double result = expr.getResult();
+            float result = expr.getResult();
         }
         else
@@ -125 +125 @@
         void parse(const std::string& str);
         const std::string& getRemains() { return  this->remains_; }
-        double             getResult()  { return  this->result_; }
+        float              getResult()  { return  this->result_; }
         bool               getSuccess() { return !this->failed_; }
 
-        void setVariable(const std::string& varname, double value);
+        void setVariable(const std::string& varname, float value);
 
     private:
-        double parse_expr_1();
-        double parse_expr_2();
-        double parse_expr_3();
-        double parse_expr_4();
-        double parse_expr_5();
-        double parse_expr_6();
-        double parse_expr_7();
-        double parse_expr_8();
+        float parse_expr_1();
+        float parse_expr_2();
+        float parse_expr_3();
+        float parse_expr_4();
+        float parse_expr_5();
+        float parse_expr_6();
+        float parse_expr_7();
+        float parse_expr_8();
         char* parse_word(char* str);
         binary_operator parse_binary_operator();
         unary_operator parse_unary_operator();
 
-        double parse_argument();
-        double parse_last_argument();
+        float parse_argument();
+        float parse_last_argument();
 
         binary_operator op;
         const char* reading_stream;
         bool failed_;
-        double result_;
+        float result_;
         std::string remains_;
-        std::map<std::string, double> variables_;
+        std::map<std::string, float> variables_;
     };
 
     //Endzeichen für float expression: ')', '}', ']', ',', ';'
-    _UtilExport bool parse_float(char* const, char**, double*);
+    _UtilExport bool parse_float(char* const, char**, float*);
     //Endzeichen angegeben
-    _UtilExport bool parse_float(char* const, char**, char, double*);
+    _UtilExport bool parse_float(char* const, char**, char, float*);
     //Letzter Teil-float eines Vektors parsen (keine Vergleichs- und Logikoperationen)
-    _UtilExport bool parse_vector_float(char* const, char**, bool, double*);
+    _UtilExport bool parse_vector_float(char* const, char**, bool, float*);
 }