Changeset 12262

Timestamp:

03/27/15 16:06:31 (10 years ago)

Author:

gkronber

Message:

#2363: implemented a fix for the performance problem without a call to .ToArray() (overwrites changes of r12227)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimplifier.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimplifier.cs

@@ -299 +299 @@
         // simplify expressions x0..xn
         // make multiplication (x0 * 1/(x1 * x1 * .. * xn))
-        var simplifiedTrees = original.Subtrees.Select(GetSimplifiedTree).ToArray();
+        var first = original.Subtrees.First();
+        var remaining = original.Subtrees.Skip(1);
         return
-          MakeProduct(simplifiedTrees.First(), Invert(simplifiedTrees.Skip(1).Aggregate(MakeProduct)));
+          MakeProduct(GetSimplifiedTree(first), Invert(remaining.Aggregate((a, b) => MakeProduct(a, GetSimplifiedTree(b)))));
       }
     }
@@ -310 +311 @@
       } else {
         return original.Subtrees
-          .Select(GetSimplifiedTree).ToArray()
+          .Select(GetSimplifiedTree)
           .Aggregate(MakeProduct);
       }
@@ -321 +322 @@
         // simplify expressions x0..xn
         // make addition (x0,-x1..-xn)
-        var simplifiedTrees = original.Subtrees.Select(GetSimplifiedTree).ToArray();
-        return simplifiedTrees.Take(1)
-          .Concat(simplifiedTrees.Skip(1).Select(Negate))
-          .Aggregate(MakeSum);
+        var first = original.Subtrees.First();
+        var remaining = original.Subtrees.Skip(1);
+        return remaining.Aggregate(GetSimplifiedTree(first), (a, b) => MakeSum(a, Negate(GetSimplifiedTree(b))));
       }
     }
@@ -335 +335 @@
         // make addition (x0..xn)
         return original.Subtrees
-          .Select(GetSimplifiedTree).ToArray()
+          .Select(GetSimplifiedTree)
           .Aggregate(MakeSum);
       }
@@ -345 +345 @@
     private ISymbolicExpressionTreeNode SimplifyOr(ISymbolicExpressionTreeNode original) {
       return original.Subtrees
-        .Select(x => GetSimplifiedTree(x))
-        .Aggregate((a, b) => MakeOr(a, b));
+        .Select(GetSimplifiedTree)
+        .Aggregate(MakeOr);
     }
     private ISymbolicExpressionTreeNode SimplifyAnd(ISymbolicExpressionTreeNode original) {
       return original.Subtrees
-        .Select(x => GetSimplifiedTree(x))
-        .Aggregate((a, b) => MakeAnd(a, b));
+        .Select(GetSimplifiedTree)
+        .Aggregate(MakeAnd);
     }
     private ISymbolicExpressionTreeNode SimplifyLessThan(ISymbolicExpressionTreeNode original) {