Changeset 8101 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis

Timestamp:

06/25/12 13:11:18 (13 years ago)

Author:

sforsten

Message:

#1776:

• added two calculators to test purposes
• ClassificationEnsembleSolutionEstimatedClassValuesView shows the current average confidence of the correct and wrong classified samples
• some calculators have been excluded from the project, so only relevant calculators are shown

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (1 diff)
• Implementation/Classification/WeightCalculators/AverageThresholdCalculator.cs (modified) (1 diff)
• Implementation/Classification/WeightCalculators/AverageThresholdClassificationCalculator.cs (added)
• Implementation/Classification/WeightCalculators/DiscriminantClassificationWeightCalculator.cs (modified) (1 diff)
• Implementation/Classification/WeightCalculators/MedianThresholdCalculator.cs (modified) (2 diffs)
• Implementation/Classification/WeightCalculators/MedianThresholdClassificationCalculator.cs (added)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -149 +149 @@
     <Compile Include="Implementation\Classification\ClassificationSolutionBase.cs" />
     <Compile Include="Implementation\Classification\DiscriminantFunctionClassificationSolutionBase.cs" />
-    <Compile Include="Implementation\Classification\WeightCalculators\AccuracyWeightCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\AverageThresholdCalculator.cs" />
-    <Compile Include="Implementation\Classification\WeightCalculators\ContinuousPointCertaintyWeightCalculator.cs" />
+    <Compile Include="Implementation\Classification\WeightCalculators\AverageThresholdClassificationCalculator.cs" />
+    <Compile Include="Implementation\Classification\WeightCalculators\MedianThresholdClassificationCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\DiscriminantClassificationWeightCalculator.cs" />
-    <Compile Include="Implementation\Classification\WeightCalculators\MedianPointThresholdCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\MedianThresholdCalculator.cs" />
-    <Compile Include="Implementation\Classification\WeightCalculators\NeighbourhoodWeightCalculator.cs" />
-    <Compile Include="Implementation\Classification\WeightCalculators\PointCertaintyWeightCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\MajorityVoteWeightCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\ClassificationWeightCalculator.cs" />

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

@@ -56 +56 @@
         if (value != null) {
           weightCalculator = value;
-          if (!ProblemData.IsEmpty)
+          if (!ProblemData.IsEmpty) {
             RecalculateResults();
+          }
         }
       }

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

@@ -57 +57 @@
     }
 
-    protected override double DiscriminantAggregateEstimatedClassValues(IDictionary<IClassificationSolution, double> estimatedClassValues, IDictionary<IDiscriminantFunctionClassificationSolution, double> estimatedValues) {
-      IList<double> values = estimatedValues.Select(x => x.Value).ToList();
-      if (values.Count <= 0)
-        return double.NaN;
-      double avg = values.Average();
-      return GetClassValueToAverage(avg);
-    }
-    private double GetClassValueToAverage(double avg) {
-      double classValue = classValues.First();
-      for (int i = 0; i < classValues.Count(); i++) {
-        if (avg > threshold[i])
-          classValue = classValues[i];
-        else
-          break;
-      }
-      return classValue;
-    }
-
     protected override double GetDiscriminantConfidence(IEnumerable<IDiscriminantFunctionClassificationSolution> solutions, int index, double estimatedClassValue) {
       // only works with binary classification

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

@@ -66 +66 @@
 
     protected virtual double DiscriminantAggregateEstimatedClassValues(IDictionary<IClassificationSolution, double> estimatedClassValues, IDictionary<IDiscriminantFunctionClassificationSolution, double> estimatedValues) {
-      return AggregateEstimatedClassValues(estimatedClassValues);
+      return base.AggregateEstimatedClassValues(estimatedClassValues);
     }
 

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

@@ -57 +57 @@
     }
 
-    protected override double DiscriminantAggregateEstimatedClassValues(IDictionary<IClassificationSolution, double> estimatedClassValues, IDictionary<IDiscriminantFunctionClassificationSolution, double> estimatedValues) {
-      IList<double> values = estimatedValues.Select(x => x.Value).ToList();
-      if (values.Count <= 0)
-        return double.NaN;
-      double median = GetMedian(values);
-      return GetClassValueToMedian(median);
-    }
-    private double GetClassValueToMedian(double median) {
-      double classValue = classValues.First();
-      for (int i = 0; i < classValues.Count(); i++) {
-        if (median > threshold[i])
-          classValue = classValues[i];
-        else
-          break;
-      }
-      return classValue;
-    }
-
     protected override double GetDiscriminantConfidence(IEnumerable<IDiscriminantFunctionClassificationSolution> solutions, int index, double estimatedClassValue) {
       // only works with binary classification
@@ -106 +88 @@
     }
 
-    private double GetMedian(IList<double> estimatedValues) {
+    protected double GetMedian(IList<double> estimatedValues) {
       int count = estimatedValues.Count;
       if (count % 2 == 0)