Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs (modified) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.cs (modified) (3 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs

@@ -32 +32 @@
     private const string ShakingFactorParameterName = "ShakingFactor";
     #region parameter properties
-    public IValueLookupParameter<DoubleValue> ShakingFactorParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters[ShakingFactorParameterName]; }
+    public IValueParameter<DoubleValue> ShakingFactorParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[ShakingFactorParameterName]; }
     }
     #endregion
     #region properties
-    public DoubleValue ShakingFactor {
-      get { return ShakingFactorParameter.ActualValue; }
+    public double ShakingFactor {
+      get { return ShakingFactorParameter.Value.Value; }
+      set { ShakingFactorParameter.Value.Value = value; }
     }
     #endregion
-
     [StorableConstructor]
     private FullTreeShaker(bool deserializing) : base(deserializing) { }
@@ -47 +47 @@
     public FullTreeShaker()
       : base() {
-      Parameters.Add(new ValueLookupParameter<DoubleValue>(ShakingFactorParameterName, "The shaking factor that should be used for the manipulation of constants (default=1.0).", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(ShakingFactorParameterName, "The shaking factor that should be used for the manipulation of constants (default=1.0).", new DoubleValue(1.0)));
     }
 
@@ -57 +57 @@
       tree.Root.ForEachNodePostfix(node => {
         if (node.HasLocalParameters) {
-          node.ShakeLocalParameters(random, ShakingFactor.Value);
+          node.ShakeLocalParameters(random, ShakingFactor);
         }
       });

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.cs

@@ -34 +34 @@
     private const string ShakingFactorParameterName = "ShakingFactor";
     #region parameter properties
-    public IValueLookupParameter<DoubleValue> ShakingFactorParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters[ShakingFactorParameterName]; }
+    public IValueParameter<DoubleValue> ShakingFactorParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[ShakingFactorParameterName]; }
     }
     #endregion
     #region properties
-    public DoubleValue ShakingFactor {
-      get { return ShakingFactorParameter.ActualValue; }
+    public double ShakingFactor {
+      get { return ShakingFactorParameter.Value.Value; }
+      set { ShakingFactorParameter.Value.Value = value; }
     }
     #endregion
@@ -48 +49 @@
     public OnePointShaker()
       : base() {
-      Parameters.Add(new ValueLookupParameter<DoubleValue>(ShakingFactorParameterName, "The shaking factor that should be used for the manipulation of constants (default=1.0).", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(ShakingFactorParameterName, "The shaking factor that should be used for the manipulation of constants (default=1.0).", new DoubleValue(1.0)));
     }
 
@@ -62 +63 @@
       if (parametricNodes.Count > 0) {
         var selectedPoint = parametricNodes.SelectRandom(random);
-        selectedPoint.ShakeLocalParameters(random, ShakingFactor.Value);
+        selectedPoint.ShakeLocalParameters(random, ShakingFactor);
       }
     }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates