Changeset 5109

Timestamp:

12/15/10 13:53:59 (14 years ago)

Author:

mkommend

Message:

Corrected SymbolicSimplifier.Negate in GP.Symbols branch (ticket #1340).

File:

• branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs (modified) (1 diff)

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

@@ -482 +482 @@
       } else if (IsAddition(x)) {
         // (x0 + x1 + .. + xn) * -1 => (-x0 + -x1 + .. + -xn)        
-        foreach (var subTree in x.SubTrees) {
-          Negate(subTree);
-        }
+        for (int i = 0; i < x.SubTrees.Count; i++)
+          x.SubTrees[i] = Negate(x.SubTrees[i]);
       } else if (IsMultiplication(x) || IsDivision(x)) {
         // x0 * x1 * .. * xn * -1 => x0 * x1 * .. * -xn
-        Negate(x.SubTrees.Last()); // last is maybe a constant, prefer to negate the constant
+        x.SubTrees[x.SubTrees.Count - 1] = Negate(x.SubTrees.Last()); // last is maybe a constant, prefer to negate the constant
       } else {
         // any other function