Changeset 7549 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification

Timestamp:

03/05/12 17:02:37 (13 years ago)

Author:

sforsten

Message:

#1776:

• models can be selected with a check box
• all strategies are now finished
• major changes have been made to provide the same behaviour when getting the estimated training or test values of an ensemble

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification

Files:

• IClassificationEnsembleSolution.cs (modified) (1 diff)
• IClassificationEnsembleSolutionWeightCalculator.cs (modified) (1 diff)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleSolution.cs

@@ -25 +25 @@
   public interface IClassificationEnsembleSolution : IClassificationSolution {
     new IClassificationEnsembleModel Model { get; }
-    IItemCollection<IClassificationSolution> ClassificationSolutions { get; }
+    ICheckedItemCollection<IClassificationSolution> ClassificationSolutions { get; }
     IEnumerable<IEnumerable<double>> GetEstimatedClassValueVectors(Dataset dataset, IEnumerable<int> rows);
   }

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleSolutionWeightCalculator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Interfaces.Classification {
+  public delegate bool CheckPoint(IClassificationProblemData problemData, int point);
   public interface IClassificationEnsembleSolutionWeightCalculator : INamedItem {
-    void CalculateNormalizedWeights(ItemCollection<IClassificationSolution> classificationSolutions);
-    IEnumerable<double> AggregateEstimatedClassValues(IEnumerable<IClassificationModel> models, Dataset dataset, IEnumerable<int> rows);
+    void CalculateNormalizedWeights(IEnumerable<IClassificationSolution> classificationSolutions);
+    IEnumerable<double> AggregateEstimatedClassValues(IEnumerable<IClassificationSolution> solutions, Dataset dataset, IEnumerable<int> rows, CheckPoint handler);
+    CheckPoint GetTestClassDelegate();
+    CheckPoint GetTrainingClassDelegate();
+    CheckPoint GetAllClassDelegate();
   }
 }