Changeset 11895 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization

Timestamp:

02/05/15 07:03:15 (10 years ago)

Author:

gkronber

Message:

#2283: constant opt, expressioncompiler, autodiff, fixes in GP solvers

File:

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

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

@@ -17 +17 @@
     // interprets sentences from L(G(Expr)):
     // Expr -> Term { ('+' | '-' | '^' ) Term } 
-    // Term -> Fact { ('*' | '/') Fact }
+    // Term -> Fact { ('*' | '%') Fact }
     // Fact -> '!' Expr | '(' Expr ')' | Var | const
     // Var -> 'a'..'z'
     // const -> '0' .. '9'
 
+    // uses protected division symbol %
     // constants are Koza-style ephemeral random constants (ERC). for now we only allow up to 10 constants.
     // The constant symbols '0' .. '9' are treated as ERC indices
@@ -35 +36 @@
       var d = new double[vars.Length];
       for (int i = 0; i < vars.Length; i++) d[i] = vars[i] ? 1.0 : 0.0;
-      return ! DoubleExtensions.IsAlmost(Expr(d, erc), 0);
+      return !DoubleExtensions.IsAlmost(Expr(d, erc), 0);
     }
 
@@ -73 +74 @@
         if (curSy == '+') {
           NewSy();
-          r += Expr(d, erc);
+          r += Term(d, erc);
         } else if (curSy == '-') {
           NewSy();
-          r -= Expr(d, erc);
+          r -= Term(d, erc);
         } else {
           NewSy();
-          var e = Expr(d, erc);
-          r = Not(r) * e + r * Not(e); // xor = (!x AND y) OR (x AND !y)
+          throw new NotImplementedException();
+          // var e = Expr(d, erc);
+          // r = Not(r) * e + r * Not(e); // xor = (!x AND y) OR (x AND !y)
         }
         curSy = CurSy();
@@ -91 +93 @@
       r = Fact(d, erc);
       var curSy = CurSy();
-      while (curSy == '*' || curSy == '/') {
+      while (curSy == '*' || curSy == '%') {
         if (curSy == '*') {
           NewSy();
-          r *= Term(d, erc);
+          r *= Fact(d, erc);
         } else {
           NewSy();
-          r /= Term(d, erc);
+          var nom = Fact(d, erc);
+          if (HeuristicLab.Common.Extensions.IsAlmost(nom, 0.0)) nom = 1.0;
+          r /= nom;
         }
         curSy = CurSy();