Changeset 17518 for branches

Timestamp:

04/27/20 14:02:29 (5 years ago)

Author:

mkommend

Message:

#2521: Added ctor in implementations of data analysis problems and sealed the basic versions.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/ClassificationProblem.cs (modified) (1 diff)
• Clustering/ClusteringProblem.cs (modified) (1 diff)
• Regression/RegressionProblem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -27 +27 @@
   [StorableType("93696570-A410-4885-A210-7220771B6050")]
   [Item("Classification Problem", "A general classification problem.")]
-  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {
-    public string Filename { get; set; }
-
+  public sealed class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {
     [StorableConstructor]
-    protected ClassificationProblem(StorableConstructorFlag _) : base(_) { }
-    protected ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
+    private ClassificationProblem(StorableConstructorFlag _) : base(_) { }
+    private ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); }
 
     public ClassificationProblem() : base(new ClassificationProblemData()) { }
+    public ClassificationProblem(IClassificationProblemData problemData) : base(problemData) { }
+
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("CB64B930-3C95-4663-B583-712B42E33712")]
   [Item("Clustering Problem", "A general clustering problem.")]
-  public class ClusteringProblem : DataAnalysisProblem<IClusteringProblemData>, IClusteringProblem {
+  public sealed class ClusteringProblem : DataAnalysisProblem<IClusteringProblemData>, IClusteringProblem {
     [StorableConstructor]
-    protected ClusteringProblem(StorableConstructorFlag _) : base(_) { }
-    protected ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { }
+    private ClusteringProblem(StorableConstructorFlag _) : base(_) { }
+    private ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new ClusteringProblem(this, cloner); }
 
     public ClusteringProblem() : base(new ClusteringProblemData()) { }
+    public ClusteringProblem(IClusteringProblemData problemData) : base(problemData) { }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("BD8AFF60-E8BE-4325-B1AC-08B7BDF37865")]
   [Item("Regression Problem", "A general regression problem.")]
-  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent {
-    public string Filename { get; set; }
-
+  public sealed class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent {
     [StorableConstructor]
-    protected RegressionProblem(StorableConstructorFlag _) : base(_) { }
-    protected RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
+    private RegressionProblem(StorableConstructorFlag _) : base(_) { }
+    private RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }
 
     public RegressionProblem() : base(new RegressionProblemData()) { }
-
+    public RegressionProblem(IRegressionProblemData problemData) : base(problemData) { }
   }
 }