Changeset 8177 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification

Timestamp:

07/02/12 13:05:42 (12 years ago)

Author:

sforsten

Message:

#1776: minor changes

Location:

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

Files:

• ClassificationEnsembleSolution.cs (modified) (1 diff)
• WeightCalculators/AverageThresholdClassificationCalculator.cs (modified) (1 diff)
• WeightCalculators/DiscriminantClassificationWeightCalculator.cs (modified) (1 diff)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs

@@ -145 +145 @@
 
       RegisterClassificationSolutionsEventHandler();
+      weightCalculator = new MajorityVoteWeightCalculator();
       classificationSolutions.AddRange(solutions);
-      weightCalculator = new MajorityVoteWeightCalculator();
     }
 

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/WeightCalculators/AverageThresholdClassificationCalculator.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  [Item("AverageThresholdCalculator", "")]
+  [Item("AverageThresholdClassificationCalculator", "")]
   public class AverageThresholdClassificationCalculator : AverageThresholdCalculator {
 

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/WeightCalculators/DiscriminantClassificationWeightCalculator.cs

@@ -54 +54 @@
     public override IEnumerable<double> AggregateEstimatedClassValues(IEnumerable<IClassificationSolution> solutions, Dataset dataset, IEnumerable<int> rows, CheckPoint handler) {
       if (!solutions.All(x => x is IDiscriminantFunctionClassificationSolution))
-        return Enumerable.Repeat<double>(0.0, rows.Count());
+        return Enumerable.Repeat<double>(double.NaN, rows.Count());
 
       IEnumerable<IDiscriminantFunctionClassificationSolution> discriminantSolutions = solutions.Cast<IDiscriminantFunctionClassificationSolution>();