Changeset 14237 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs

Timestamp:

08/05/16 14:25:28 (8 years ago)

Author:

gkronber

Message:

#2650: work in progress..

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs (modified) (4 diffs)

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  public class FactorVariableTreeNode : SymbolicExpressionTreeTerminalNode {
+  public class FactorVariableTreeNode : VariableTreeNodeBase {
     public new FactorVariable Symbol {
       get { return (FactorVariable)base.Symbol; }
-    }
-    [Storable]
-    private string variableName;
-    public string VariableName {
-      get { return variableName; }
-      set { variableName = value; }
     }
 
@@ -49 +43 @@
     protected FactorVariableTreeNode(FactorVariableTreeNode original, Cloner cloner)
       : base(original, cloner) {
-      variableName = original.variableName;
       variableValue = original.variableValue;
     }
@@ -61 +54 @@
     public override void ResetLocalParameters(IRandom random) {
       base.ResetLocalParameters(random);
-      variableName = Symbol.VariableNames.SampleRandom(random);
       variableValue = Symbol.GetVariableValues(VariableName).SampleRandom(random);
     }
 
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
-      base.ShakeLocalParameters(random, shakingFactor);
+      // 50% additive & 50% multiplicative
+      if (random.NextDouble() < 0.5) {
+        double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorMu, Symbol.WeightManipulatorSigma);
+        Weight = Weight + x * shakingFactor;
+      } else {
+        double x = NormalDistributedRandom.NextDouble(random, 1.0, Symbol.MultiplicativeWeightManipulatorSigma);
+        Weight = Weight * x;
+      }
       if (random.NextDouble() < 0.2) {
-        variableName = Symbol.VariableNames.SampleRandom(random);
+        VariableName = Symbol.VariableNames.SampleRandom(random);
       }
       variableValue = Symbol.GetVariableValues(VariableName).SampleRandom(random);
@@ -78 +77 @@
 
     public override string ToString() {
-      return variableName + " = " + variableValue;
+      return base.ToString() + " = " + variableValue;
     }
   }