Context Navigation

HeuristicLab.Problems.DataAnalysis

Timestamp:

02/17/11 13:22:49 (14 years ago)

Author:

mkommend

Message:

#1418: Made evaluators and problems generic to create the parameters correctly.

Location:

Files:

-                      r5501
+                      r5509
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IClassificationEvaluator : IDataAnalysisEvaluator {
+    new IClassificationProblemData ProblemData { get; }
+  }
+  public interface IClassificationEvaluator : IDataAnalysisEvaluator<IClassificationProblemData> { }
+}

-                      r5501
+                      r5509
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IClassificationProblem : IDataAnalysisProblem {
+    new IClassificationProblemData ProblemData { get; }
+    new IClassificationEvaluator Evaluator { get; }
+  public interface IClassificationProblem : IDataAnalysisProblem<IClassificationProblemData> {
     new IClassificationSolutionCreator SolutionCreator { get; }
+  }

-                      r5501
+                      r5509
 #endregion
+using System;
+using System.Collections.Generic;
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IClassificationSolution : IDataAnalysisSolution {
     new IClassificationModel Model { get; }
     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;
+  }
+}

r5501	r5509
21	21
22	22	namespace HeuristicLab.Problems.DataAnalysis {
23		public interface IClassificationSolutionCreator : IDataAnalysisSolutionCreator {
	23	public interface IClassificationSolutionCreator : IDataAnalysisSolutionCreator<IClassificationProblemData> {
24	24	}
25	25	}

-                      r5500
+                      r5509
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IDataAnalysisEvaluator : IEvaluator {
+    IValueLookupParameter<IDataAnalysisProblemData> ProblemDataParameter { get; }
+    IDataAnalysisProblemData ProblemData { get; }
+  public interface IDataAnalysisEvaluator<T> : IEvaluator
+   where T : class, IDataAnalysisProblemData {
+    IValueLookupParameter<T> ProblemDataParameter { get; }
+    T ProblemData { get; }
+  }
+}

-                      r5486
+                      r5509
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IDataAnalysisProblem : IProblem {
+    IDataAnalysisProblemData ProblemData { get; }
+    new IDataAnalysisEvaluator Evaluator { get; }
+    new IDataAnalysisSolutionCreator SolutionCreator { get; }
+  public interface IDataAnalysisProblem<T> : IProblem
+  where T : class, IDataAnalysisProblemData {
+    T ProblemData { get; }
+    new IDataAnalysisEvaluator<T> Evaluator { get; }
+    new IDataAnalysisSolutionCreator<T> SolutionCreator { get; }
+  }
+}

-                      r5500
+                      r5509
 #endregion
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
 …
     int TestSamplesStart { get; }
     int TestSamplesEnd { get; }
+    event EventHandler Changed;
+  }
+}

-                      r5484
+                      r5509
 #endregion
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IDataAnalysisSolutionCreator : ISolutionCreator {
+  public interface IDataAnalysisSolutionCreator<T> : ISolutionCreator
+  where T : class, IDataAnalysisProblemData {
+    IValueLookupParameter<T> ProblemDataParameter { get; }
+    T ProblemData { get; }
+  }
+}

r5500	r5509
21	21
22	22	namespace HeuristicLab.Problems.DataAnalysis {
23		public interface IRegressionEvaluator : IDataAnalysisEvaluator {
24		new IRegressionProblemData ProblemData { get; }
	23	public interface IRegressionEvaluator : IDataAnalysisEvaluator<IRegressionProblemData> {
25	24	}
26	25	}

-                      r5500
+                      r5509
 namespace HeuristicLab.Problems.DataAnalysis {
+  public interface IRegressionProblem : IDataAnalysisProblem {
+    new IRegressionProblemData ProblemData { get; }
+    new IRegressionEvaluator Evaluator { get; }
+  public interface IRegressionProblem : IDataAnalysisProblem<IRegressionProblemData> {
     new IRegressionSolutionCreator SolutionCreator { get; }
+  }

r5496	r5509
21	21
22	22	namespace HeuristicLab.Problems.DataAnalysis {
23		public interface IRegressionSolutionCreator : IDataAnalysisSolutionCreator {
	23	public interface IRegressionSolutionCreator : IDataAnalysisSolutionCreator<IRegressionProblemData> {
24	24	}
25	25	}

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