Changeset 17515

Timestamp:

04/20/20 16:13:56 (5 years ago)

Author:

mkommend

Message:

#2521: Added interface for supervised dataanalysis problem data.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Classification/ClassificationProblem.cs (modified) (1 diff)
• Interfaces/Classification/IClassificationModel.cs (modified) (2 diffs)
• Interfaces/Classification/IClassificationProblem.cs (modified) (1 diff)
• Interfaces/Classification/IClassificationProblemData.cs (modified) (1 diff)
• Interfaces/IDataAnalysisProblem.cs (modified) (1 diff)
• Interfaces/ISupervisedDataAnalysisModel.cs (added)
• Interfaces/ISupervisedDataAnalysisProblem.cs (added)
• Interfaces/ISupervisedDataAnalysisProblemData.cs (added)
• Interfaces/Regression/IRegressionModel.cs (modified) (2 diffs)
• Interfaces/Regression/IRegressionProblem.cs (modified) (1 diff)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -118 +118 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interfaces\ISupervisedDataAnalysisModel.cs" />
+    <Compile Include="Interfaces\ISupervisedDataAnalysisProblem.cs" />
+    <Compile Include="Interfaces\ISupervisedDataAnalysisProblemData.cs" />
     <Compile Include="DatasetExtensions.cs" />
     <Compile Include="DatasetUtil.cs" />

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using HEAL.Attic;
@@ -28 +27 @@
   /// <summary>
   /// Interface for all classification models.
-  /// <remarks>All methods and properties in in this interface must be implemented thread safely</remarks>
+  /// <remarks>All methods and properties in this interface must be implemented thread safely</remarks>
   /// </summary>
-  public interface IClassificationModel : IDataAnalysisModel {
+  public interface IClassificationModel : ISupervisedDataAnalysisModel {
     IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows);
     IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
     bool IsProblemDataCompatible(IClassificationProblemData problemData, out string errorMessage);
-    string TargetVariable { get; set; }
-    event EventHandler TargetVariableChanged;
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("fd15f587-2a68-4180-86c4-82410e3f22e2")]
-  public interface IClassificationProblem : IDataAnalysisProblem<IClassificationProblemData> {
+  public interface IClassificationProblem : ISupervisedDataAnalysisProblem<IClassificationProblemData> {
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblemData.cs

@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("8cd26df9-aed7-4378-9516-04322b6f9d2e")]
-  public interface IClassificationProblemData : IDataAnalysisProblemData {
-    string TargetVariable { get; set; }
-
+  public interface IClassificationProblemData : ISupervisedDataAnalysisProblemData {
     IEnumerable<string> ClassNames { get; }
     string PositiveClass { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
+  //TODO Change to new empty problem interface
   [StorableType("74e4c570-3881-4bfa-a5bb-2bb71cdee2b3")]
   public interface IDataAnalysisProblem : IProblem {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using HEAL.Attic;
@@ -28 +27 @@
   /// <summary>
   /// Interface for all regression models.
-  /// <remarks>All methods and properties in in this interface must be implemented thread safely</remarks>
+  /// <remarks>All methods and properties in this interface must be implemented thread safely</remarks>
   /// </summary>
-  public interface IRegressionModel : IDataAnalysisModel {
+  public interface IRegressionModel : ISupervisedDataAnalysisModel {
     IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows);
     IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData);
     bool IsProblemDataCompatible(IRegressionProblemData problemData, out string errorMessage);
-    string TargetVariable { get; set; }
-    event EventHandler TargetVariableChanged;
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblem.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("4541dcea-2a97-451f-b3bd-84a1342e2b1d")]
-  public interface IRegressionProblem : IDataAnalysisProblem<IRegressionProblemData> {
+  public interface IRegressionProblem : ISupervisedDataAnalysisProblem<IRegressionProblemData> {
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("1ef22b8b-f3b4-494b-8cdd-f08e84e316e0")]
-  public interface IRegressionProblemData : IDataAnalysisProblemData {
-    string TargetVariable { get; set; }
-
+  public interface IRegressionProblemData : ISupervisedDataAnalysisProblemData {
     IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }