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

Timestamp:

05/14/12 16:20:06 (13 years ago)

Author:

sforsten

Message:

#1784:

• removed obsolete import & export methods from RegressionProblem and ClassificationProblem, because they are implemented in the base classes
• removed unnecessary references in Problems.QuadraticAssignment.Views

Location:

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

Files:

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

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

@@ -42 +42 @@
       ProblemData = new ClassificationProblemData();
     }
-
-    #region Import & Export
-    public new void Load(IClassificationProblemData data) {
-      base.Load(data);
-    }
-
-    public IClassificationProblemData Export() {
-      if (ProblemData is IClassificationProblemData) {
-        return ProblemData;
-      } else {
-        ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-        return base.Export(claData);
-      }
-    }
-    #endregion
   }
 }

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

@@ -92 +92 @@
 
     #region Import & Export
-    protected void Load(T data) {
+    public void Load(T data) {
       Name = data.Name;
       Description = data.Description;
@@ -99 +99 @@
     }
 
-    protected T Export(T data) {
-      data.Name = Name;
-      data.Description = Description;
-      data.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
-      data.TrainingPartition.End = ProblemData.TrainingPartition.End;
-      data.TestPartition.Start = ProblemData.TestPartition.Start;
-      data.TestPartition.End = ProblemData.TestPartition.End;
-      return data;
+    public T Export() {
+      return ProblemData;
     }
     #endregion

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

@@ -42 +42 @@
       ProblemData = new RegressionProblemData();
     }
-
-    #region Import & Export
-    public new void Load(IRegressionProblemData data) {
-      base.Load(data);
-    }
-
-    public IRegressionProblemData Export() {
-      if (ProblemData is IRegressionProblemData) {
-        return ProblemData;
-      } else {
-        RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-        return base.Export(regData);
-      }
-    }
-    #endregion
   }
 }