Context Navigation

Changeset 17515 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

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

Author:

mkommend

Message:

#2521: Added interface for supervised dataanalysis problem data.

Location:

Files:

-                      r16801
+                      r17515
   </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" />

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

-                      r17226
+                      r17515
 #endregion
-using System;
 using System.Collections.Generic;
 using HEAL.Attic;
 …
   /// <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;
+  }
+}

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

-                      r17226
+                      r17515
 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; }

-                      r17226
+                      r17515
 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 {

-                      r17226
+                      r17515
 #endregion
-using System;
 using System.Collections.Generic;
 using HEAL.Attic;
 …
   /// <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;
+  }
+}

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

-                      r17226
+                      r17515
 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; }

Note: See TracChangeset for help on using the changeset viewer.