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

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.Symbolic.Classification/3.4

Files:

• MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs (modified) (3 diffs)
• SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
@@ -30 +31 @@
   [StorableClass]
   [Creatable("Problems")]
-  public class SymbolicClassificationMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IClassificationProblemData, ISymbolicClassificationMultiObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IClassificationProblem {
+  public class SymbolicClassificationMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IClassificationProblemData, ISymbolicClassificationMultiObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IClassificationProblem,
+    IProblemInstanceConsumer<IClassificationProblemData>, IProblemInstanceExporter<IClassificationProblemData> {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;
@@ -107 +109 @@
       }
     }
+
+    #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.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

@@ -31 +31 @@
   [Creatable("Problems")]
   public class SymbolicClassificationSingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IClassificationProblemData, ISymbolicClassificationSingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IClassificationProblem,
-    IProblemInstanceConsumer<ClassificationProblemData>, IProblemInstanceExporter<ClassificationProblemData> {
+    IProblemInstanceConsumer<IClassificationProblemData>, IProblemInstanceExporter<IClassificationProblemData> {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;
@@ -112 +112 @@
 
     #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);
       }
     }