Changeset 7805 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis

Timestamp:

05/14/12 15:21:28 (13 years ago)

Author:

sforsten

Message:

#1784: changes have been applied, according to the review comments of mkommend

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/ClassificationProblem.cs (modified) (2 diffs)
• Regression/RegressionProblem.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -30 +30 @@
   [Creatable("Problems")]
   public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent,
-    IProblemInstanceConsumer<ClassificationProblemData>, IProblemInstanceExporter<ClassificationProblemData> {
+    IProblemInstanceConsumer<IClassificationProblemData>, IProblemInstanceExporter<IClassificationProblemData> {
     public string Filename { get; set; }
 
@@ -44 +44 @@
 
     #region Import & Export
-    public void Load(ClassificationProblemData data) {
+    public new void Load(IClassificationProblemData data) {
       base.Load(data);
     }
 
-    public ClassificationProblemData Export() {
-      if (ProblemData is ClassificationProblemData) {
-        return (ClassificationProblemData)ProblemData;
+    public IClassificationProblemData Export() {
+      if (ProblemData is IClassificationProblemData) {
+        return ProblemData;
       } else {
         ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-        return (ClassificationProblemData)base.Export(claData);
+        return base.Export(claData);
       }
     }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

@@ -30 +30 @@
   [Creatable("Problems")]
   public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent,
-    IProblemInstanceConsumer<RegressionProblemData>, IProblemInstanceExporter<RegressionProblemData> {
+    IProblemInstanceConsumer<IRegressionProblemData>, IProblemInstanceExporter<IRegressionProblemData> {
     public string Filename { get; set; }
 
@@ -44 +44 @@
 
     #region Import & Export
-    public void Load(RegressionProblemData data) {
+    public new void Load(IRegressionProblemData data) {
       base.Load(data);
     }
 
-    public RegressionProblemData Export() {
-      if (ProblemData is RegressionProblemData) {
-        return (RegressionProblemData)ProblemData;
+    public IRegressionProblemData Export() {
+      if (ProblemData is IRegressionProblemData) {
+        return ProblemData;
       } else {
         RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-        return (RegressionProblemData)base.Export(regData);
+        return base.Export(regData);
       }
     }