Changeset 15132 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Timestamp:

07/06/17 10:22:27 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14827, r14829:14832 from trunk to stable

Location:

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• BinaryFactorVariable.cs (modified) (2 diffs)
• FactorVariable.cs (modified) (2 diffs)
• Variable.cs (modified) (2 diffs)
• VariableBase.cs (modified) (11 diffs)
• VariableTreeNodeBase.cs (modified) (1 diff)

stable/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 =

stable/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 =

stable/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) {
     }

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableBase.cs

@@ -34 +34 @@
       get { return weightMu; }
       set {
-        if(value != weightMu) {
+        if (value != weightMu) {
           weightMu = value;
           OnChanged(EventArgs.Empty);
@@ -45 +45 @@
       get { return weightSigma; }
       set {
-        if(weightSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
-        if(value != weightSigma) {
+        if (weightSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+        if (value != weightSigma) {
           weightSigma = value;
           OnChanged(EventArgs.Empty);
@@ -57 +57 @@
       get { return weightManipulatorMu; }
       set {
-        if(value != weightManipulatorMu) {
+        if (value != weightManipulatorMu) {
           weightManipulatorMu = value;
           OnChanged(EventArgs.Empty);
@@ -68 +68 @@
       get { return weightManipulatorSigma; }
       set {
-        if(weightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
-        if(value != weightManipulatorSigma) {
+        if (weightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+        if (value != weightManipulatorSigma) {
           weightManipulatorSigma = value;
           OnChanged(EventArgs.Empty);
@@ -80 +80 @@
       get { return multiplicativeWeightManipulatorSigma; }
       set {
-        if(multiplicativeWeightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
-        if(value != multiplicativeWeightManipulatorSigma) {
+        if (multiplicativeWeightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+        if (value != multiplicativeWeightManipulatorSigma) {
           multiplicativeWeightManipulatorSigma = value;
           OnChanged(EventArgs.Empty);
@@ -94 +94 @@
       get { return variableChangeProbability; }
       set {
-        if(value < 0 || value > 1.0) throw new ArgumentException("Variable change probability must lie in the interval [0..1]");
+        if (value < 0 || value > 1.0) throw new ArgumentException("Variable change probability must lie in the interval [0..1]");
         variableChangeProbability = value;
       }
@@ -104 +104 @@
       get { return variableNames; }
       set {
-        if(value == null) throw new ArgumentNullException();
+        if (value == null) throw new ArgumentNullException();
         variableNames.Clear();
         variableNames.AddRange(value);
@@ -116 +116 @@
       get { return allVariableNames; }
       set {
-        if(value == null) throw new ArgumentNullException();
+        if (value == null) throw new ArgumentNullException();
         allVariableNames.Clear();
         allVariableNames.AddRange(value);
@@ -124 +124 @@
     public override bool Enabled {
       get {
-        if(variableNames.Count == 0) return false;
+        if (variableNames.Count == 0) return false;
         return base.Enabled;
       }
       set {
-        if(variableNames.Count == 0) base.Enabled = false;
+        if (variableNames.Count == 0) base.Enabled = false;
         else base.Enabled = value;
       }
@@ -146 +146 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if(allVariableNames == null || (allVariableNames.Count == 0 && variableNames.Count > 0)) {
+      if (allVariableNames == null || (allVariableNames.Count == 0 && variableNames.Count > 0)) {
         allVariableNames = variableNames;
       }
@@ -167 +167 @@
       multiplicativeWeightManipulatorSigma = original.multiplicativeWeightManipulatorSigma;
       variableChangeProbability = original.variableChangeProbability;
-      }
+    }
     protected VariableBase(string name, string description)
       : base(name, description) {

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs

@@ -79 +79 @@
       }
 
-      if (Symbol.VariableChangeProbability >= 1.0 || random.NextDouble() < Symbol.VariableChangeProbability) {
-        var oldName = variableName;
+      if (Symbol.VariableChangeProbability >= 1.0) {
+        // old behaviour for backwards compatibility
+        #region Backwards compatible code, remove with 3.4
 #pragma warning disable 612, 618
         variableName = Symbol.VariableNames.SelectRandom(random);
 #pragma warning restore 612, 618
+        #endregion
+      } else if (random.NextDouble() < Symbol.VariableChangeProbability) {
+        var oldName = variableName;
+        variableName = Symbol.VariableNames.SampleRandom(random);
         if (oldName != variableName) {
+          // re-initialize weight if the variable is changed
           weight = NormalDistributedRandom.NextDouble(random, Symbol.WeightMu, Symbol.WeightSigma);
         }