Changeset 5326 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols

Timestamp:

01/18/11 16:09:35 (14 years ago)

Author:

gkronber

Message:

Implemented multiplicative manipulation of constants and variable weights. #1384

Location:

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

Files:

• Constant.cs (modified) (4 diffs)
• ConstantTreeNode.cs (modified) (1 diff)
• Variable.cs (modified) (4 diffs)
• VariableTreeNode.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Constant.cs

@@ -30 +30 @@
   [Item("Constant", "Represents a constant value.")]
   public sealed class Constant : Symbol {
-    #region Propeties
+    #region Properties
     [Storable]
     private double minValue;
@@ -76 +76 @@
       }
     }
+    [Storable(DefaultValue = 0.0)]
+    private double multiplicativeManipulatorSigma;
+    public double MultiplicativeManipulatorSigma {
+      get { return multiplicativeManipulatorSigma; }
+      set {
+        if (value < 0) throw new ArgumentException();
+        if (value != multiplicativeManipulatorSigma) {
+          multiplicativeManipulatorSigma = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
+
     #endregion
     [StorableConstructor]
@@ -85 +98 @@
       manipulatorMu = original.manipulatorMu;
       manipulatorSigma = original.manipulatorSigma;
+      multiplicativeManipulatorSigma = original.multiplicativeManipulatorSigma;
     }
     public Constant()
@@ -90 +104 @@
       manipulatorMu = 0.0;
       manipulatorSigma = 1.0;
+      multiplicativeManipulatorSigma = 0.03;
       minValue = -20.0;
       maxValue = 20.0;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/ConstantTreeNode.cs

@@ -63 +63 @@
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
       base.ShakeLocalParameters(random, shakingFactor);
-      double x = NormalDistributedRandom.NextDouble(random, Symbol.ManipulatorMu, Symbol.ManipulatorSigma);
-      Value = Value + x * shakingFactor;
+      // 50% additive & 50% multiplicative
+      if (random.NextDouble() < 0.5) {
+        double x = NormalDistributedRandom.NextDouble(random, Symbol.ManipulatorMu, Symbol.ManipulatorSigma);
+        Value = Value + x * shakingFactor;
+      } else {
+        double x = NormalDistributedRandom.NextDouble(random, 1.0, Symbol.MultiplicativeManipulatorSigma);
+        Value = Value * x;
+      }
     }
 

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

@@ -78 +78 @@
       }
     }
+    [Storable(DefaultValue = 0.0)]
+    private double multiplicativeWeightManipulatorSigma;
+    public double MultiplicativeWeightManipulatorSigma {
+      get { return multiplicativeWeightManipulatorSigma; }
+      set {
+        if (multiplicativeWeightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+        if (value != multiplicativeWeightManipulatorSigma) {
+          multiplicativeWeightManipulatorSigma = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
     private List<string> variableNames;
     [Storable]
@@ -91 +103 @@
     #endregion
     [StorableConstructor]
-    protected Variable(bool deserializing) : base(deserializing) {
+    protected Variable(bool deserializing)
+      : base(deserializing) {
       variableNames = new List<string>();
     }
@@ -101 +114 @@
       weightManipulatorMu = original.weightManipulatorMu;
       weightManipulatorSigma = original.weightManipulatorSigma;
+      multiplicativeWeightManipulatorSigma = original.multiplicativeWeightManipulatorSigma;
     }
     public Variable() : this("Variable", "Represents a variable value.") { }
@@ -109 +123 @@
       weightManipulatorMu = 0.0;
       weightManipulatorSigma = 1.0;
+      multiplicativeWeightManipulatorSigma = 0.03;
       variableNames = new List<string>();
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs

@@ -68 +68 @@
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
       base.ShakeLocalParameters(random, shakingFactor);
-      double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorMu, Symbol.WeightManipulatorSigma);
-      weight = weight + x * shakingFactor;
+      // 50% additive & 50% multiplicative
+      if (random.NextDouble() < 0) {
+        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;
+      }
       variableName = Symbol.VariableNames.SelectRandom(random);
     }