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

Timestamp:

03/06/12 15:08:13 (12 years ago)

Author:

sforsten

Message:

#1776:

• bug fix in NeighbourhoodWeightCalculator
• added GetConfidence method to IClassificationEnsembleSolutionWeightCalculator
• adjusted the confidence column in ClassificationEnsembleSolutionEstimatedClassValuesView

File:

• branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (9 diffs)

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

@@ -51 +51 @@
     }
 
-    //[Storable]
-    //private Dictionary<IClassificationModel, IntRange> trainingPartitions;
-    //[Storable]
-    //private Dictionary<IClassificationModel, IntRange> testPartitions;
-
     private IClassificationEnsembleSolutionWeightCalculator weightCalculator;
 
@@ -66 +61 @@
         }
       }
+      get { return weightCalculator; }
     }
 
@@ -77 +73 @@
       foreach (var model in Model.Models) {
         IClassificationProblemData problemData = (IClassificationProblemData)ProblemData.Clone();
-        //problemData.TrainingPartition.Start = trainingPartitions[model].Start;
-        //problemData.TrainingPartition.End = trainingPartitions[model].End;
-        //problemData.TestPartition.Start = testPartitions[model].Start;
-        //problemData.TestPartition.End = testPartitions[model].End;
-
         classificationSolutions.Add(model.CreateClassificationSolution(problemData));
       }
@@ -89 +80 @@
     private ClassificationEnsembleSolution(ClassificationEnsembleSolution original, Cloner cloner)
       : base(original, cloner) {
-      //trainingPartitions = new Dictionary<IClassificationModel, IntRange>();
-      //testPartitions = new Dictionary<IClassificationModel, IntRange>();
-      //foreach (var pair in original.trainingPartitions) {
-      //  trainingPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
-      //}
-      //foreach (var pair in original.testPartitions) {
-      //  testPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
-      //}
-
       classificationSolutions = cloner.Clone(original.classificationSolutions);
       RegisterClassificationSolutionsEventHandler();
@@ -104 +86 @@
     public ClassificationEnsembleSolution()
       : base(new ClassificationEnsembleModel(), ClassificationEnsembleProblemData.EmptyProblemData) {
-      //trainingPartitions = new Dictionary<IClassificationModel, IntRange>();
-      //testPartitions = new Dictionary<IClassificationModel, IntRange>();
       classificationSolutions = new CheckedItemCollection<IClassificationSolution>();
 
@@ -121 +101 @@
     public ClassificationEnsembleSolution(IEnumerable<IClassificationModel> models, IClassificationProblemData problemData, IEnumerable<IntRange> trainingPartitions, IEnumerable<IntRange> testPartitions)
       : base(new ClassificationEnsembleModel(Enumerable.Empty<IClassificationModel>()), new ClassificationEnsembleProblemData(problemData)) {
-      //this.trainingPartitions = new Dictionary<IClassificationModel, IntRange>();
-      //this.testPartitions = new Dictionary<IClassificationModel, IntRange>();
       this.classificationSolutions = new CheckedItemCollection<IClassificationSolution>();
 
@@ -217 +195 @@
           solution.ProblemData = problemData;
       }
-      //foreach (var trainingPartition in trainingPartitions.Values) {
-      //  trainingPartition.Start = ProblemData.TrainingPartition.Start;
-      //  trainingPartition.End = ProblemData.TrainingPartition.End;
-      //}
-      //foreach (var testPartition in testPartitions.Values) {
-      //  testPartition.Start = ProblemData.TestPartition.Start;
-      //  testPartition.End = ProblemData.TestPartition.End;
-      //}
-
       base.OnProblemDataChanged();
     }
@@ -256 +225 @@
       if (Model.Models.Contains(solution.Model)) throw new ArgumentException();
       Model.Add(solution.Model);
-      //trainingPartitions[solution.Model] = solution.ProblemData.TrainingPartition;
-      //testPartitions[solution.Model] = solution.ProblemData.TestPartition;
     }
 
@@ -263 +230 @@
       if (!Model.Models.Contains(solution.Model)) throw new ArgumentException();
       Model.Remove(solution.Model);
-      //trainingPartitions.Remove(solution.Model);
-      //testPartitions.Remove(solution.Model);
     }
   }