Changeset 3512 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/23/10 14:27:06 (14 years ago)

Author:

gkronber

Message:

Implemented manipulation operators. #937 (Data types and operators for symbolic expression tree encoding)

Location:

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

Files:

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

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

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
+using System;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
@@ -45 +46 @@
       set { maxValue = value; }
     }
+    [Storable]
+    private double manipulatorNu;
+    public double ManipulatorNu {
+      get { return manipulatorNu; }
+      set { manipulatorNu = value; }
+    }
+    [Storable]
+    private double manipulatorSigma;
+    public double ManipulatorSigma {
+      get { return manipulatorSigma; }
+      set {
+        if (value < 0) throw new ArgumentException();
+        manipulatorSigma = value;
+      }
+    }
     #endregion
     public Constant()
       : base() {
+      manipulatorNu = 0.0;
+      manipulatorSigma = 1.0;
+      minValue = -20.0;
+      maxValue = 20.0;
     }
 
@@ -55 +75 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Constant clone = (Constant) base.Clone(cloner);
+      Constant clone = (Constant)base.Clone(cloner);
       clone.minValue = minValue;
       clone.maxValue = maxValue;
+      clone.manipulatorNu = manipulatorNu;
+      clone.manipulatorSigma = manipulatorSigma;
       return clone;
     }

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);
+      var normalDistributedRNG = new NormalDistributedRandom(random, Symbol.ManipulatorNu, Symbol.ManipulatorSigma);
+      double x = normalDistributedRNG.NextDouble();
+      Value = Value + x * shakingFactor;
+    }
+
     public override object Clone() {
       return new ConstantTreeNode(this);

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

@@ -52 +52 @@
     }
     [Storable]
+    private double weightManipulatorNu;
+    public double WeightManipulatorNu {
+      get { return weightManipulatorNu; }
+      set { weightManipulatorNu = value; }
+    }
+    [Storable]
+    private double weightManipulatorSigma;
+    public double WeightManipulatorSigma {
+      get { return weightManipulatorSigma; }
+      set {
+        if (weightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+        weightManipulatorSigma = value;
+      }
+    }
+    [Storable]
     private List<string> variableNames;
     public IEnumerable<string> VariableNames {
@@ -66 +81 @@
       weightNu = 1.0;
       weightSigma = 1.0;
+      weightManipulatorNu = 0.0;
+      weightManipulatorSigma = 1.0;
       variableNames = new List<string>();
     }
@@ -78 +95 @@
       clone.weightSigma = weightSigma;
       clone.variableNames = new List<string>(variableNames);
+      clone.weightManipulatorNu = weightManipulatorNu;
+      clone.weightManipulatorSigma = weightManipulatorSigma;
       return clone;
     }

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

@@ -69 +69 @@
       var normalDistributedRNG = new NormalDistributedRandom(random, Symbol.WeightNu, Symbol.WeightSigma);
       weight = normalDistributedRNG.NextDouble();
-      var variableList = new List<string>(Symbol.VariableNames);
-      int variableIndex = random.Next(0, variableList.Count);
-      variableName = variableList[variableIndex];
+      variableName = Symbol.VariableNames.SelectRandom(random);
     }
+
+    public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
+      base.ShakeLocalParameters(random, shakingFactor);
+      var normalDistributedRNG = new NormalDistributedRandom(random, Symbol.WeightManipulatorNu, Symbol.WeightManipulatorSigma);
+      double x = normalDistributedRNG.NextDouble();
+      weight = weight + x * shakingFactor;
+      variableName = Symbol.VariableNames.SelectRandom(random);
+    }
+
 
     public override object Clone() {