Changeset 14615

Timestamp:

01/27/17 16:01:28 (8 years ago)

Author:

mkommend

Message:

#2650: Minor changes in factors branch (sealed one factor classes).

Location:

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• BaselineClassifiers/OneFactorClassificationModel.cs (modified) (7 diffs)
• BaselineClassifiers/OneFactorClassificationSolution.cs (modified) (2 diffs)
• BaselineClassifiers/OneRClassificationModel.cs (modified) (6 diffs)
• BaselineClassifiers/OneRClassificationSolution.cs (modified) (2 diffs)
• Linear/AlglibUtil.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneFactorClassificationModel.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using HeuristicLab.Common;
@@ -32 +31 @@
   [StorableClass]
   [Item("OneFactor Classification Model", "A model that uses only one categorical feature (factor) to determine the class.")]
-  public class OneFactorClassificationModel : ClassificationModel {
+  public sealed class OneFactorClassificationModel : ClassificationModel {
     public override IEnumerable<string> VariablesUsedForPrediction {
       get { return new[] { Variable }; }
@@ -38 +37 @@
 
     [Storable]
-    protected string variable;
+    private string variable;
     public string Variable {
       get { return variable; }
@@ -44 +43 @@
 
     [Storable]
-    protected string[] variableValues;
+    private string[] variableValues;
     public string[] VariableValues {
       get { return variableValues; }
@@ -50 +49 @@
 
     [Storable]
-    protected double[] classes;
+    private double[] classes;
     public double[] Classes {
       get { return classes; }
@@ -56 +55 @@
 
     [Storable]
-    protected double defaultClass;
+    private double defaultClass;
     public double DefaultClass {
       get { return defaultClass; }
@@ -62 +61 @@
 
     [StorableConstructor]
-    protected OneFactorClassificationModel(bool deserializing) : base(deserializing) { }
-    protected OneFactorClassificationModel(OneFactorClassificationModel original, Cloner cloner)
+    private OneFactorClassificationModel(bool deserializing) : base(deserializing) { }
+    private OneFactorClassificationModel(OneFactorClassificationModel original, Cloner cloner)
       : base(original, cloner) {
       this.variable = (string)original.variable;

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneFactorClassificationSolution.cs

@@ -28 +28 @@
   [StorableClass]
   [Item(Name = "OneR Classification Solution", Description = "Represents a OneR classification solution which uses only a single factor for class prediction.")]
-  public class OneFactorClassificationSolution : ClassificationSolution {
+  public sealed class OneFactorClassificationSolution : ClassificationSolution {
     public new OneFactorClassificationModel Model {
       get { return (OneFactorClassificationModel)base.Model; }
@@ -35 +35 @@
 
     [StorableConstructor]
-    protected OneFactorClassificationSolution(bool deserializing) : base(deserializing) { }
-    protected OneFactorClassificationSolution(OneFactorClassificationSolution original, Cloner cloner) : base(original, cloner) { }
+    private OneFactorClassificationSolution(bool deserializing) : base(deserializing) { }
+    private OneFactorClassificationSolution(OneFactorClassificationSolution original, Cloner cloner) : base(original, cloner) { }
     public OneFactorClassificationSolution(OneFactorClassificationModel model, IClassificationProblemData problemData)
       : base(model, problemData) {

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationModel.cs

@@ -31 +31 @@
   [StorableClass]
   [Item("OneR Classification Model", "A model that uses intervals for one variable to determine the class.")]
-  public class OneRClassificationModel : ClassificationModel {
+  public sealed class OneRClassificationModel : ClassificationModel {
     public override IEnumerable<string> VariablesUsedForPrediction {
       get { return new[] { Variable }; }
@@ -37 +37 @@
 
     [Storable]
-    protected string variable;
+    private string variable;
     public string Variable {
       get { return variable; }
@@ -43 +43 @@
 
     [Storable]
-    protected double[] splits;
+    private double[] splits;
     public double[] Splits {
       get { return splits; }
@@ -49 +49 @@
 
     [Storable]
-    protected double[] classes;
+    private double[] classes;
     public double[] Classes {
       get { return classes; }
@@ -55 +55 @@
 
     [Storable]
-    protected double missingValuesClass;
+    private double missingValuesClass;
     public double MissingValuesClass {
       get { return missingValuesClass; }
@@ -61 +61 @@
 
     [StorableConstructor]
-    protected OneRClassificationModel(bool deserializing) : base(deserializing) { }
-    protected OneRClassificationModel(OneRClassificationModel original, Cloner cloner)
+    private OneRClassificationModel(bool deserializing) : base(deserializing) { }
+    private OneRClassificationModel(OneRClassificationModel original, Cloner cloner)
       : base(original, cloner) {
       this.variable = (string)original.variable;

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationSolution.cs

@@ -28 +28 @@
   [StorableClass]
   [Item(Name = "OneR Classification Solution", Description = "Represents a OneR classification solution which uses only a single feature with potentially multiple thresholds for class prediction.")]
-  public class OneRClassificationSolution : ClassificationSolution {
+  public sealed class OneRClassificationSolution : ClassificationSolution {
     public new OneRClassificationModel Model {
       get { return (OneRClassificationModel)base.Model; }
@@ -35 +35 @@
 
     [StorableConstructor]
-    protected OneRClassificationSolution(bool deserializing) : base(deserializing) { }
-    protected OneRClassificationSolution(OneRClassificationSolution original, Cloner cloner) : base(original, cloner) { }
+    private OneRClassificationSolution(bool deserializing) : base(deserializing) { }
+    private OneRClassificationSolution(OneRClassificationSolution original, Cloner cloner) : base(original, cloner) { }
     public OneRClassificationSolution(OneRClassificationModel model, IClassificationProblemData problemData)
       : base(model, problemData) {

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/AlglibUtil.cs

@@ -104 +104 @@
         var varName = kvp.Key;
         var cats = kvp.Value;
-        var catCount = cats.Count();
-        if (catCount == 0) continue;
+        if (!cats.Any()) continue;
         foreach (var cat in cats) {
           var values = dataset.GetStringValues(varName, rows);