Changeset 4022 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariableTreeNode.cs
- Timestamp:
- 07/09/10 17:01:36 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariableTreeNode.cs
r3997 r4022 30 30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols { 31 31 [StorableClass] 32 public sealed class LaggedVariableTreeNode : SymbolicExpressionTreeTerminalNode {32 public sealed class LaggedVariableTreeNode : VariableTreeNode { 33 33 public new LaggedVariable Symbol { 34 34 get { return (LaggedVariable)base.Symbol; } 35 }36 [Storable]37 private double weight;38 public double Weight {39 get { return weight; }40 set { weight = value; }41 }42 [Storable]43 private string variableName;44 public string VariableName {45 get { return variableName; }46 set { variableName = value; }47 35 } 48 36 [Storable] … … 58 46 private LaggedVariableTreeNode(LaggedVariableTreeNode original) 59 47 : base(original) { 60 weight = original.weight;61 variableName = original.variableName;62 48 lag = original.lag; 63 49 } … … 73 59 public override void ResetLocalParameters(IRandom random) { 74 60 base.ResetLocalParameters(random); 75 weight = NormalDistributedRandom.NextDouble(random, Symbol.WeightNu, Symbol.WeightSigma);76 variableName = Symbol.VariableNames.SelectRandom(random);77 61 lag = random.Next(Symbol.MinLag, Symbol.MaxLag + 1); 78 62 } … … 80 64 public override void ShakeLocalParameters(IRandom random, double shakingFactor) { 81 65 base.ShakeLocalParameters(random, shakingFactor); 82 double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorNu, Symbol.WeightManipulatorSigma); 83 weight = weight + x * shakingFactor; 84 variableName = Symbol.VariableNames.SelectRandom(random); 85 lag = lag + random.Next(-1, 2); 66 lag = Math.Min(Symbol.MaxLag, Math.Max(Symbol.MinLag, lag + random.Next(-1, 2))); 86 67 } 87 68 … … 92 73 93 74 public override string ToString() { 94 return weight.ToString("E4") + " " + variableName + " (t" + (lag > 0 ? "+" : "") + lag + ")"; 75 return base.ToString() + 76 " (t" + (lag > 0 ? "+" : "") + lag + ")"; 95 77 } 96 78 }
Note: See TracChangeset
for help on using the changeset viewer.