Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -33 +33 @@
   [StorableClass]
   [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
-  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData {
+  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {
     protected const string TargetVariableParameterName = "TargetVariable";
     protected const string ClassNamesParameterName = "ClassNames";
@@ -39 +39 @@
     protected const int MaximumNumberOfClasses = 20;
     protected const int InspectedRowsToDetermineTargets = 500;
+
+    public string Filename { get; set; }
 
     #region default data

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

@@ -29 +29 @@
   [StorableClass]
   [Item("ClusteringProblemData", "Represents an item containing all data defining a clustering problem.")]
-  public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData {
+  public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData, IStorableContent {
+    public string Filename { get; set; }
 
     #region default data

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs

@@ -37 +37 @@
     public string Filename { get; set; }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -33 +33 @@
   [StorableClass]
   [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")]
-  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData {
+  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
     protected const string TargetVariableParameterName = "TargetVariable";
+    public string Filename { get; set; }
 
     #region default data