Changeset 5649 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces

Timestamp:

03/10/11 10:00:09 (14 years ago)

Author:

gkronber

Message:

#1418 Implemented classes for classification based on a discriminant function and thresholds and implemented interfaces and base classes for clustering.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces

Files:

• Classification/IClassificationModel.cs (modified) (1 diff)
• Classification/IClassificationSolution.cs (modified) (1 diff)
• Classification/IDiscriminantFunctionClassificationModel.cs (added)
• Classification/IDiscriminantFunctionClassificationSolution.cs (added)
• Clustering (added)
• Clustering/IClusteringModel.cs (added)
• Clustering/IClusteringProblem.cs (added)
• Clustering/IClusteringProblemData.cs (added)
• Clustering/IClusteringSolution.cs (added)
• IDataAnalysisProblemData.cs (modified) (1 diff)
• Regression/IRegressionModel.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IClassificationModel : IDataAnalysisModel {
-    IEnumerable<double> GetEstimatedValues(IClassificationProblemData problemData, IEnumerable<int> rows);
-    IEnumerable<double> GetEstimatedClassValues(IClassificationProblemData problemData, IEnumerable<int> rows);
+    IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows);
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolution.cs

@@ -27 +27 @@
     new IClassificationProblemData ProblemData { get; }
 
-    IEnumerable<double> EstimatedValues { get; }
-    IEnumerable<double> EstimatedTrainingValues { get; }
-    IEnumerable<double> EstimatedTestValues { get; }
-    IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows);
-
-    IEnumerable<double> Thresholds { get; }
     IEnumerable<double> EstimatedClassValues { get; }
     IEnumerable<double> EstimatedTrainingClassValues { get; }
     IEnumerable<double> EstimatedTestClassValues { get; }
     IEnumerable<double> GetEstimatedClassValues(IEnumerable<int> rows);
-
-    event EventHandler ThresholdsChanged;
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

@@ -28 +28 @@
   public interface IDataAnalysisProblemData : IParameterizedNamedItem {
     Dataset Dataset { get; }
-    ICheckedItemCollection<StringValue> InputVariables { get; }
+    ICheckedItemList<StringValue> InputVariables { get; }
     IEnumerable<string> AllowedInputVariables { get; }
 

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IRegressionModel : IDataAnalysisModel {
-    IEnumerable<double> GetEstimatedValues(IRegressionProblemData problemData, IEnumerable<int> rows);
+    IEnumerable<double> GetEstimatedValues(Dataset dataset, IEnumerable<int> rows);
   }
 }