Changeset 9119 for branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR

Timestamp:

01/07/13 17:33:56 (12 years ago)

Author:

sforsten

Message:

#1998:

• added OneRClassificationModelView
• added ClassificationSolutionComparisonView
• added several calculators (ConfusionMatrixCalculator, FOneScoreCalculator, MatthewsCorrelationCoefficientCalculator)
• fixed bug in OneR
• added StorableClass and Item attribute to several classes

Location:

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR

Files:

• OneRClassificationModel.cs (modified) (3 diffs)
• OneRClassificationSolution.cs (modified) (1 diff)

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR/OneRClassificationModel.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
+  [StorableClass]
+  [Item("1R Classification Model", "A model that uses intervals for one variable to determine the class.")]
   public class OneRClassificationModel : NamedItem, IClassificationModel {
     [Storable]
@@ -52 +54 @@
     protected OneRClassificationModel(OneRClassificationModel original, Cloner cloner)
       : base(original, cloner) {
-      this.splits = original.splits;
+      this.variable = (string)original.variable;
+      this.splits = (double[])original.splits.Clone();
+      this.classes = (double[])original.classes.Clone();
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new OneRClassificationModel(this, cloner); }
@@ -58 +62 @@
     public OneRClassificationModel(string variable, double[] splits, double[] classes)
       : base() {
+      if (splits.Length != classes.Length) {
+        throw new ArgumentException("Number of splits and classes has to be equal.");
+      }
       if (!Double.IsPositiveInfinity(splits[splits.Length - 1])) {
         throw new ArgumentException("Last split has to be double.PositiveInfinity, so that all values are covered.");

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR/OneRClassificationSolution.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
+  [StorableClass]
+  [Item(Name = "1R Classification Solution", Description = "Represents a 1R classification solution (model + data).")]
   public class OneRClassificationSolution : ClassificationSolution {
-    public new ConstantClassificationModel Model {
-      get { return (ConstantClassificationModel)base.Model; }
+    public new OneRClassificationModel Model {
+      get { return (OneRClassificationModel)base.Model; }
       set { base.Model = value; }
     }