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

Timestamp:

04/30/12 12:52:09 (12 years ago)

Author:

sforsten

Message:

#1784:

• added some regions for readability
• added import and export methods in DataAnalysisProblem and SymbolicDataAnalysisProblem to reduce code duplication
• added a recursive and an iterative approach without many linq expression to generate all combinations of list elements in ValueGenerator

Location:

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

Files:

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

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

@@ -43 +43 @@
     }
 
+    #region Import & Export
     public void Load(ClassificationProblemData data) {
-      Name = data.Name;
-      Description = data.Description;
-      ProblemData = new ClassificationProblemData(data.Dataset, data.AllowedInputVariables, data.TargetVariable);
-      ProblemData.TrainingPartition.Start = data.TrainingPartition.Start;
-      ProblemData.TrainingPartition.End = data.TrainingPartition.End;
-      ProblemData.TestPartition.Start = data.TestPartition.Start;
-      ProblemData.TestPartition.End = data.TestPartition.End;
-      OnReset();
+      base.Load(data);
     }
 
     public ClassificationProblemData Export() {
-      ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-      claData.Name = Name;
-      claData.Description = Description;
-      claData.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
-      claData.TrainingPartition.End = ProblemData.TrainingPartition.End;
-      claData.TestPartition.Start = ProblemData.TestPartition.Start;
-      claData.TestPartition.End = ProblemData.TestPartition.End;
-      return claData;
+      if (ProblemData is ClassificationProblemData) {
+        return (ClassificationProblemData)ProblemData;
+      } else {
+        ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
+        return (ClassificationProblemData)base.Export(claData);
+      }
     }
+    #endregion
   }
 }

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

@@ -90 +90 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    #region Import & Export
+    protected void Load(T data) {
+      Name = data.Name;
+      Description = data.Description;
+      ProblemData = data;
+      OnReset();
+    }
+
+    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;
+    }
+    #endregion
   }
 }

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

@@ -43 +43 @@
     }
 
+    #region Import & Export
     public void Load(RegressionProblemData data) {
-      Name = data.Name;
-      Description = data.Description;
-      ProblemData = new RegressionProblemData(data.Dataset, data.AllowedInputVariables, data.TargetVariable);
-      ProblemData.TrainingPartition.Start = data.TrainingPartition.Start;
-      ProblemData.TrainingPartition.End = data.TrainingPartition.End;
-      ProblemData.TestPartition.Start = data.TestPartition.Start;
-      ProblemData.TestPartition.End = data.TestPartition.End;
-      OnReset();
+      base.Load(data);
     }
 
     public RegressionProblemData Export() {
-      RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
-      regData.Name = Name;
-      regData.Description = Description;
-      regData.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
-      regData.TrainingPartition.End = ProblemData.TrainingPartition.End;
-      regData.TestPartition.Start = ProblemData.TestPartition.Start;
-      regData.TestPartition.End = ProblemData.TestPartition.End;
-      return regData;
+      if (ProblemData is RegressionProblemData) {
+        return (RegressionProblemData)ProblemData;
+      } else {
+        RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
+        return (RegressionProblemData)base.Export(regData);
+      }
     }
+    #endregion
   }
 }