Changeset 4391 for branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Interfaces

Timestamp:

09/14/10 18:46:12 (14 years ago)

Author:

mkommend

Message:

updated classification branch (ticket #939)

Location:

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Interfaces

Files:

• ISymbolicClassificationAnalyzer.cs (modified) (1 diff)
• ISymbolicClassificationEvaluator.cs (modified) (1 diff)

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Interfaces/ISymbolicClassificationAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
-
-// This interface is exactly the same as ISymbolicRegressionAnalyzer
-// consider creating a base interface for both analyzer
-
+using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Analyzers;
 namespace HeuristicLab.Problems.DataAnalysis.Classification {
-  public interface ISymbolicClassificationAnalyzer : ISymbolicExpressionTreeAnalyzer {
-    ILookupParameter<ResultCollection> ResultsParameter { get; }
+  public interface ISymbolicClassificationAnalyzer : ISymbolicRegressionAnalyzer {
   }
 }

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Interfaces/ISymbolicClassificationEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic;
 namespace HeuristicLab.Problems.DataAnalysis.Classification {
-  public interface ISymbolicClassificationEvaluator : ISingleObjectiveEvaluator {
-    ILookupParameter<ISymbolicExpressionTreeInterpreter> SymbolicExpressionTreeInterpreterParameter { get; }
-    ILookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
-    ILookupParameter<ClassificationProblemData> RegressionProblemDataParameter { get; }
-    IValueLookupParameter<IntValue> SamplesStartParameter { get; }
-    IValueLookupParameter<IntValue> SamplesEndParameter { get; }
-    IValueLookupParameter<DoubleValue> UpperEstimationLimitParameter { get; }
-    IValueLookupParameter<DoubleValue> LowerEstimationLimitParameter { get; }
-
-
-    double Evaluate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree tree,
-          double lowerEstimationLimit, double upperEstimationLimit,
-          Dataset dataset, string targetVariable, IEnumerable<double> sortedClassValues, IEnumerable<int> rows);
+  public interface ISymbolicClassificationEvaluator : ISymbolicRegressionEvaluator {
+    ClassificationProblemData ClassificationProblemData { get; }
   }
 }