Changeset 11732 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/ExpressionInterpreter.cs

Timestamp:

01/07/15 09:21:46 (9 years ago)

Author:

gkronber

Message:

#2283: refactoring and bug fixes

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/ExpressionInterpreter.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/ExpressionInterpreter.cs

@@ -54 +54 @@
       var r = 0.0;
       r = Term(d);
-      while (CurSy() == '+' || CurSy() == '-' || CurSy() == '^') {
-        if (CurSy() == '+') {
+      var curSy = CurSy();
+      while (curSy == '+' || curSy == '-' || curSy == '^') {
+        if (curSy == '+') {
           NewSy();
           r += Expr(d);
-        } else if (CurSy() == '-') {
+        } else if (curSy == '-') {
           NewSy();
           r -= Expr(d);
-        } else if (CurSy() == '^') {
+        } else {
           NewSy();
           var e = Expr(d);
           r = Not(r) * e + r * Not(e); // xor = (!x AND y) OR (x AND !y)
         }
+        curSy = CurSy();
       }
       return r;
@@ -73 +75 @@
       var r = 0.0;
       r = Fact(d);
-      while (CurSy() == '*' || CurSy() == '/') {
-        if (CurSy() == '*') {
+      var curSy = CurSy();
+      while (curSy == '*' || curSy == '/') {
+        if (curSy == '*') {
           NewSy();
           r *= Term(d);
-        } else if (CurSy() == '/') {
+        } else {
           NewSy();
           r /= Term(d);
         }
+        curSy = CurSy();
       }
       return r;
@@ -87 +91 @@
     private double Fact(double[] d) {
       double r = 0.0;
-      if (CurSy() == '!') {
+      var curSy = CurSy();
+      if (curSy == '!') {
         NewSy();
         r = Not(Expr(d));
-      } else if (CurSy() == '(') {
+      } else if (curSy == '(') {
         NewSy();
         r = Expr(d);
         if (CurSy() != ')') throw new ArgumentException();
         NewSy();
-      } else if (CurSy() >= 'a' && CurSy() <= 'z') {
-        int o = Convert.ToByte(CurSy()) - Convert.ToByte('a');
+      } else /* if (curSy >= 'a' && curSy <= 'z') */ {
+        int o = (byte)curSy - (byte)'a';
+        //int o = Convert.ToByte(CurSy()) - Convert.ToByte('a');
         if (o < 0 || o >= d.Length) throw new ArgumentException();
         r = d[o];
         NewSy();
-      } else throw new ArgumentException();
+      }
+      //} else throw new ArgumentException();
       return r;
     }