Changeset 12637

Timestamp:

07/07/15 13:00:56 (9 years ago)

Author:

gkronber

Message:

#2374: merged r12485 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs

@@ -30 +30 @@
   /// </summary>
   [StorableClass]
-  public abstract class ClassificationSolution : ClassificationSolutionBase {
+  public class ClassificationSolution : ClassificationSolutionBase {
     protected readonly Dictionary<int, double> evaluationCache;
 
@@ -46 +46 @@
       evaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
       CalculateClassificationResults();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ClassificationSolution(this, cloner);
     }
 

stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

@@ -30 +30 @@
   /// </summary>
   [StorableClass]
-  public abstract class RegressionSolution : RegressionSolutionBase {
+  public class RegressionSolution : RegressionSolutionBase {
     protected readonly Dictionary<int, double> evaluationCache;
 
@@ -42 +42 @@
       evaluationCache = new Dictionary<int, double>(original.evaluationCache);
     }
-    protected RegressionSolution(IRegressionModel model, IRegressionProblemData problemData)
+    public RegressionSolution(IRegressionModel model, IRegressionProblemData problemData)
       : base(model, problemData) {
       evaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
@@ -48 +48 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RegressionSolution(this, cloner);
+    }
 
     public override IEnumerable<double> EstimatedValues {