Changeset 14243 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Timestamp:

08/08/16 13:00:06 (8 years ago)

Author:

gkronber

Message:

#2650: renamed FactorVariable -> BinaryFactorVariable

Location:

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• BinaryFactorVariable.cs (moved) (moved from branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariable.cs) (3 diffs)
• BinaryFactorVariableTreeNode.cs (moved) (moved from branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs) (3 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/BinaryFactorVariable.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("FactorVariable", "Represents a categorical variable (comparable to factors as in R).")]
-  public class FactorVariable : VariableBase {
+  [Item("BinaryFactorVariable", "Represents a categorical variable (comparable to factors as in R) and it's value.")]
+  public class BinaryFactorVariable : VariableBase {
 
     private Dictionary<string, List<string>> variableValues;
@@ -47 +47 @@
 
     [StorableConstructor]
-    protected FactorVariable(bool deserializing)
+    protected BinaryFactorVariable(bool deserializing)
       : base(deserializing) {
       variableValues = new Dictionary<string, List<string>>();
     }
-    protected FactorVariable(FactorVariable original, Cloner cloner)
+    protected BinaryFactorVariable(BinaryFactorVariable original, Cloner cloner)
       : base(original, cloner) {
       variableValues =
         original.variableValues.ToDictionary(kvp => kvp.Key, kvp => new List<string>(kvp.Value));
     }
-    public FactorVariable() : this("FactorVariable", "Represents a categorical variable (comparable to factors as in R).") { }
-    public FactorVariable(string name, string description)
+    public BinaryFactorVariable() : this("BinaryFactorVariable", "Represents a categorical variable (comparable to factors as in R) and it's value.") { }
+    public BinaryFactorVariable(string name, string description)
       : base(name, description) {
       variableValues = new Dictionary<string, List<string>>();
@@ -67 +67 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new FactorVariable(this, cloner);
+      return new BinaryFactorVariable(this, cloner);
     }
 

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/BinaryFactorVariableTreeNode.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  public class FactorVariableTreeNode : VariableTreeNodeBase {
-    public new FactorVariable Symbol {
-      get { return (FactorVariable)base.Symbol; }
+  public class BinaryFactorVariableTreeNode : VariableTreeNodeBase {
+    public new BinaryFactorVariable Symbol {
+      get { return (BinaryFactorVariable)base.Symbol; }
     }
 
@@ -40 +39 @@
 
     [StorableConstructor]
-    protected FactorVariableTreeNode(bool deserializing) : base(deserializing) { }
-    protected FactorVariableTreeNode(FactorVariableTreeNode original, Cloner cloner)
+    protected BinaryFactorVariableTreeNode(bool deserializing) : base(deserializing) { }
+    protected BinaryFactorVariableTreeNode(BinaryFactorVariableTreeNode original, Cloner cloner)
       : base(original, cloner) {
       variableValue = original.variableValue;
     }
-    protected FactorVariableTreeNode() { }
-    public FactorVariableTreeNode(FactorVariable variableSymbol) : base(variableSymbol) { }
+    protected BinaryFactorVariableTreeNode() { }
+    public BinaryFactorVariableTreeNode(BinaryFactorVariable variableSymbol) : base(variableSymbol) { }
 
     public override bool HasLocalParameters {
@@ -73 +72 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new FactorVariableTreeNode(this, cloner);
+      return new BinaryFactorVariableTreeNode(this, cloner);
     }