Changeset 13090 for branches

Timestamp:

10/29/15 20:26:28 (9 years ago)

Author:

gkronber

Message:

#1998: moved OneR and ZeroR out of the folder for linear models, renamed OneRTest -> OneR

Location:

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• BaselineClassifiers (added)
• BaselineClassifiers/OneR.cs (moved) (moved from branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneRTest.cs) (4 diffs)
• BaselineClassifiers/OneRClassificationModel.cs (moved) (moved from branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR/OneRClassificationModel.cs) (1 diff)
• BaselineClassifiers/OneRClassificationSolution.cs (moved) (moved from branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR/OneRClassificationSolution.cs) (1 diff)
• BaselineClassifiers/ZeroR.cs (moved) (moved from branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/ZeroR.cs) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (3 diffs)

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneR.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -34 +34 @@
   /// 1R classification algorithm.
   /// </summary>
-  [Item("OneR Classification", "A simple classification algorithm the searches the best single-variable split (does not support categorical features correctly).")]
+  [Item("OneR Classification", "A simple classification algorithm the searches the best single-variable split (does not support categorical features correctly). See R.C. Holte (1993). Very simple classification rules perform well on most commonly used datasets. Machine Learning. 11:63-91.")]
   [StorableClass]
-  public sealed class OneRTest : FixedDataAnalysisAlgorithm<IClassificationProblem> {
+  [Creatable("Data Analysis")] // TODO
+  public sealed class OneR : FixedDataAnalysisAlgorithm<IClassificationProblem> {
 
     public IValueParameter<IntValue> MinBucketSizeParameter {
@@ -43 +44 @@
 
     [StorableConstructor]
-    private OneRTest(bool deserializing) : base(deserializing) { }
+    private OneR(bool deserializing) : base(deserializing) { }
 
-    private OneRTest(OneRTest original, Cloner cloner)
+    private OneR(OneR original, Cloner cloner)
       : base(original, cloner) { }
 
-    public OneRTest()
+    public OneR()
       : base() {
       Parameters.Add(new ValueParameter<IntValue>("MinBucketSize", "Minimum size of a bucket for numerical values. (Except for the rightmost bucket)", new IntValue(6)));
@@ -55 +56 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new OneRTest(this, cloner);
+      return new OneR(this, cloner);
     }
 

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationModel.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationSolution.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/ZeroR.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -202 +202 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BaselineClassifiers\OneR.cs" />
+    <Compile Include="BaselineClassifiers\OneRClassificationModel.cs" />
+    <Compile Include="BaselineClassifiers\OneRClassificationSolution.cs" />
+    <Compile Include="BaselineClassifiers\ZeroR.cs" />
     <Compile Include="CrossValidation.cs">
       <SubType>Code</SubType>
@@ -317 +321 @@
     </Compile>
     <Compile Include="Linear\AlglibUtil.cs" />
-    <Compile Include="Linear\OneRTest.cs" />
-    <Compile Include="Linear\OneR\OneRClassificationModel.cs" />
-    <Compile Include="Linear\OneR\OneRClassificationSolution.cs" />
     <Compile Include="Linear\Scaling.cs" />
     <Compile Include="Linear\LinearDiscriminantAnalysis.cs" />
@@ -328 +329 @@
     <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
     <Compile Include="Linear\MultinomialLogitModel.cs" />
-    <Compile Include="Linear\ZeroR.cs" />
     <Compile Include="Nca\Initialization\INcaInitializer.cs" />
     <Compile Include="Nca\Initialization\LdaInitializer.cs" />