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

Timestamp:

02/07/12 16:50:35 (13 years ago)

Author:

sforsten

Message:

#1776:

• selection of a voting strategy is now possible
• a more sophisticated strategy as discussed with gkronber will be implemented soon

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (8 diffs)
• Implementation/Classification/WeightCalculators/AccuracyWeightCalculator.cs (modified) (1 diff)
• Implementation/Classification/WeightCalculators/AdaBoostWeightCalculator.cs (added)
• Interfaces/Classification/IClassificationEnsembleSolutionWeightCalculator.cs (modified) (1 diff)

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

@@ -129 +129 @@
     <Compile Include="Implementation\Classification\DiscriminantFunctionClassificationSolutionBase.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\AccuracyWeightCalculator.cs" />
+    <Compile Include="Implementation\Classification\WeightCalculators\AdaBoostWeightCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\MajorityVoteWeightCalculator.cs" />
     <Compile Include="Implementation\Classification\WeightCalculators\WeightCalculator.cs" />

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

@@ -51 +51 @@
     }
 
+    public IEnumerable<double> Weights {
+      get { return new List<double>(weights); }
+    }
+
     [Storable]
     private Dictionary<IClassificationModel, IntRange> trainingPartitions;
@@ -56 +60 @@
     private Dictionary<IClassificationModel, IntRange> testPartitions;
 
+    private IEnumerable<double> weights;
+
     private IClassificationEnsembleSolutionWeightCalculator weightCalculator;
+
+    public IClassificationEnsembleSolutionWeightCalculator WeightCalculator {
+      set {
+        if (value != null) {
+          weightCalculator = value;
+          weights = weights = weightCalculator.CalculateWeights(classificationSolutions);
+          if (!ProblemData.IsEmpty)
+            RecalculateResults();
+        }
+      }
+    }
 
     [StorableConstructor]
@@ -98 +115 @@
       classificationSolutions = new ItemCollection<IClassificationSolution>();
 
-      weightCalculator = new AccuracyWeightCalculator();
+      weightCalculator = new MajorityVoteWeightCalculator();
 
       RegisterClassificationSolutionsEventHandler();
@@ -158 +175 @@
                                          .ToList();
         var rowsEnumerator = rows.GetEnumerator();
-        IEnumerable<double> weights = weightCalculator.CalculateWeights(classificationSolutions);
         // aggregate to make sure that MoveNext is called for all enumerators 
         while (rowsEnumerator.MoveNext() & estimatedValuesEnumerators.Select(en => en.EstimatedValuesEnumerator.MoveNext()).Aggregate(true, (acc, b) => acc & b)) {
@@ -178 +194 @@
                                          .ToList();
         var rowsEnumerator = ProblemData.TestIndizes.GetEnumerator();
-        IEnumerable<double> weights = weightCalculator.CalculateWeights(classificationSolutions);
         // aggregate to make sure that MoveNext is called for all enumerators 
         while (rowsEnumerator.MoveNext() & estimatedValuesEnumerators.Select(en => en.EstimatedValuesEnumerator.MoveNext()).Aggregate(true, (acc, b) => acc & b)) {
@@ -203 +218 @@
 
     public override IEnumerable<double> GetEstimatedClassValues(IEnumerable<int> rows) {
-      IEnumerable<double> weights = weightCalculator.CalculateWeights(classificationSolutions);
       return from xs in GetEstimatedClassValueVectors(ProblemData.Dataset, rows)
              select AggregateEstimatedClassValues(xs, weights);
@@ -302 +316 @@
       trainingPartitions[solution.Model] = solution.ProblemData.TrainingPartition;
       testPartitions[solution.Model] = solution.ProblemData.TestPartition;
+      weights = weightCalculator.CalculateWeights(classificationSolutions);
     }
 
@@ -309 +324 @@
       trainingPartitions.Remove(solution.Model);
       testPartitions.Remove(solution.Model);
+      weights = weightCalculator.CalculateWeights(classificationSolutions);
     }
   }

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

@@ -28 +28 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   /// <summary>
-  /// Represents a weight calculator that gives every classification solution a weight based on the accuracy..
+  /// Represents a weight calculator that gives every classification solution a weight based on the accuracy.
   /// </summary>
   [StorableClass]

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Interfaces.Classification {
-  public interface IClassificationEnsembleSolutionWeightCalculator {
+  public interface IClassificationEnsembleSolutionWeightCalculator : INamedItem {
     IEnumerable<double> CalculateWeights(ItemCollection<IClassificationSolution> classificationSolutions);
   }