Changeset 14830

Timestamp:

04/06/17 11:40:45 (7 years ago)

Author:

gkronber

Message:

#2650: sealed variable symbol classes

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• BinaryFactorVariable.cs (modified) (2 diffs)
• FactorVariable.cs (modified) (2 diffs)
• Variable.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/BinaryFactorVariable.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("BinaryFactorVariable", "Represents a categorical variable (comparable to factors as in R) and it's value.")]
-  public class BinaryFactorVariable : VariableBase {
+  public sealed class BinaryFactorVariable : VariableBase {
 
     private readonly Dictionary<string, List<string>> variableValues;
@@ -47 +47 @@
 
     [StorableConstructor]
-    protected BinaryFactorVariable(bool deserializing)
+    private BinaryFactorVariable(bool deserializing)
       : base(deserializing) {
       variableValues = new Dictionary<string, List<string>>();
     }
-    protected BinaryFactorVariable(BinaryFactorVariable original, Cloner cloner)
+    private BinaryFactorVariable(BinaryFactorVariable original, Cloner cloner)
       : base(original, cloner) {
       variableValues =

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariable.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("FactorVariable", "Represents a categorical variable (comparable to factors as in R).")]
-  public class FactorVariable : VariableBase {
+  public sealed class FactorVariable : VariableBase {
     private readonly Dictionary<string, Dictionary<string, int>> variableValues; // for each variable value also store a zero-based index
     [Storable]
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected FactorVariable(bool deserializing)
+    private FactorVariable(bool deserializing)
       : base(deserializing) {
       variableValues = new Dictionary<string, Dictionary<string, int>>();
     }
-    protected FactorVariable(FactorVariable original, Cloner cloner)
+    private FactorVariable(FactorVariable original, Cloner cloner)
       : base(original, cloner) {
       variableValues =

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Variable.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +27 @@
   [StorableClass]
   [Item("Variable", "Represents a variable value.")]
-  public class Variable : VariableBase {
+  public sealed class Variable : VariableBase {
 
     [StorableConstructor]
-    protected Variable(bool deserializing)
+    private Variable(bool deserializing)
       : base(deserializing) {
     }
-    protected Variable(Variable original, Cloner cloner)
+    private Variable(Variable original, Cloner cloner)
       : base(original, cloner) {
     }