Changeset 15148 for stable

Timestamp:

07/06/17 11:31:42 (7 years ago)

Author:

gkronber

Message:

#2650: merged r15053,r15054 from trunk to stable

Location:

stable

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs (modified) (1 diff)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs

@@ -1054 +1054 @@
               representative.Weights[j] += node.Weights[j];
             }
-          }
-          for (int j = 0; j < representative.Weights.Length; j++) {
-            representative.Weights[j] += constant;
           }
           sum.AddSubtree(representative);

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs

@@ -419 +419 @@
 
     public async Task RemoveSolutionAsync(IRegressionSolution solution) {
-      throw new NotSupportedException();
+      if (!solutions.Remove(solution))
+        return;
+
+      seriesCache.Remove(solution);
+      ciSeriesCache.Remove(solution);
+
+      await RecalculateAsync();
+      var args = new EventArgs<IRegressionSolution>(solution);
+      OnSolutionRemoved(this, args);
     }