Changeset 13267 for trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression

Timestamp:

11/18/15 22:29:17 (9 years ago)

Author:

mkommend

Message:

#2472: Minor code improvements in HL.Problems.GP (typos, code organization, code unification).

File:

• trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs

@@ -102 +102 @@
       return InterpretRec(tree.Root.GetSubtree(0).GetSubtree(0), dataset, rows);
     }
-
-
+                                                                                                       
     private IEnumerable<double> InterpretRec(ISymbolicExpressionTreeNode node, IDataset dataset, IEnumerable<int> rows) {
-      var eval = CreateEvalClosure(dataset, rows);
+      Func<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode, Func<double, double, double>, IEnumerable<double>> binaryEval =
+        (left, right, f) => InterpretRec(left, dataset,rows).Zip(InterpretRec(right, dataset, rows), f);
 
       switch (node.Symbol.Name) {
-        case "+": return eval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x + y);
-        case "*": return eval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x * y);
-        case "-": return eval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x - y);
-        case "%": return eval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => y.IsAlmost(0.0) ? 0.0 : x / y); // protected division
+        case "+": return binaryEval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x + y);
+        case "*": return binaryEval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x * y);
+        case "-": return binaryEval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => x - y);
+        case "%": return binaryEval(node.GetSubtree(0), node.GetSubtree(1), (x, y) => y.IsAlmost(0.0) ? 0.0 : x / y); // protected division
         default: {
             double erc;
@@ -124 +124 @@
     }
 
-    private Func<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode, Func<double, double, double>, IEnumerable<double>> CreateEvalClosure(IDataset dataset, IEnumerable<int> rows) {
-      // capture dataset and rows in scope
-      return (a, b, f) => {
-        var leftResult = InterpretRec(a, dataset, rows);
-        var rightResult = InterpretRec(b, dataset, rows);
-        return leftResult.Zip(rightResult, f);
-      };
-    }
-
     #region item cloning and persistence
     // persistence