Changeset 11909 for trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Creators

Timestamp:

02/05/15 11:09:38 (10 years ago)

Author:

abeham

Message:

#2253:

• Changed parameter from fixedvalue to valuelookup to be consistent with other operators in binary encoding plugin
• Added backwards compatibility region
• Fixed several other inconsistencies

File:

• trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Creators/RandomBinaryVectorCreator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Creators/RandomBinaryVectorCreator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +36 @@
     private const string TrueProbabilityParameterName = "TruePropability";
 
-    private IFixedValueParameter<DoubleValue> TrueProbabilityParameter {
-      get { return (IFixedValueParameter<DoubleValue>)Parameters[TrueProbabilityParameterName]; }
+    private IValueLookupParameter<DoubleValue> TrueProbabilityParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters[TrueProbabilityParameterName]; }
     }
 
-    public double TrueProbability {
-      get { return TrueProbabilityParameter.Value.Value; }
-      set { TrueProbabilityParameter.Value.Value = value; }
+    public DoubleValue TrueProbability {
+      get { return TrueProbabilityParameter.Value; }
+      set { TrueProbabilityParameter.Value = value; }
     }
 
     [StorableConstructor]
     private RandomBinaryVectorCreator(bool deserializing) : base(deserializing) { }
-
     private RandomBinaryVectorCreator(RandomBinaryVectorCreator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new RandomBinaryVectorCreator(this, cloner); }
-
     public RandomBinaryVectorCreator()
       : base() {
-      Parameters.Add(new FixedValueParameter<DoubleValue>(TrueProbabilityParameterName, "Probability of true value", new DoubleValue(0.5)));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>(TrueProbabilityParameterName, "Probability of true value", new DoubleValue(0.5)));
     }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      var defaultValue = 0.5;
+      if (Parameters.ContainsKey(TrueProbabilityParameterName) && Parameters[TrueProbabilityParameterName] is IFixedValueParameter<DoubleValue>) {
+        defaultValue = ((IFixedValueParameter<DoubleValue>)Parameters[TrueProbabilityParameterName]).Value.Value;
+        Parameters.Remove(TrueProbabilityParameterName);
+      }
       if (!Parameters.ContainsKey(TrueProbabilityParameterName))
-        Parameters.Add(new FixedValueParameter<DoubleValue>(TrueProbabilityParameterName, "Probability of true value", new DoubleValue(0.5)));
+        Parameters.Add(new ValueLookupParameter<DoubleValue>(TrueProbabilityParameterName, "Probability of true value", new DoubleValue(defaultValue)));
+      #endregion
     }
 
@@ -74 +81 @@
       //remove with HL 3.4
       if (trueProbability.IsAlmost(0.5))
-      result = new BinaryVector(length, random);
+        result = new BinaryVector(length, random);
       else {
         var values = new bool[length];
@@ -85 +92 @@
 
     protected override BinaryVector Create(IRandom random, IntValue length) {
-      return Apply(random, length.Value, TrueProbability);
+      if (TrueProbabilityParameter.ActualValue == null) throw new InvalidOperationException("RandomBinaryVectorCreator: Parameter " + TrueProbabilityParameter.ActualName + " could not be found.");
+      return Apply(random, length.Value, TrueProbabilityParameter.ActualValue.Value);
     }
   }