Changeset 12706 for stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers

Timestamp:

07/10/15 12:02:20 (9 years ago)

Author:

mkommend

Message:

#2320: Merged r12422, r12423, r12424, r12480, r12481 and r12482 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (4 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs (modified) (4 diffs)

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -183 +184 @@
                                    select branch).ToList();
         if (allowedInternalBranches.Count > 0) {
-          return allowedInternalBranches.SelectRandom(random);
+          return allowedInternalBranches.SampleRandom(random);
+
         } else {
           // no internal nodes allowed => select leaf nodes
@@ -189 +191 @@
                                  where branch == null || branch.SubtreeCount == 0
                                  select branch).ToList();
-          return allowedLeafBranches.SelectRandom(random);
+          return allowedLeafBranches.SampleRandom(random);
         }
       } else {
@@ -197 +199 @@
                                select branch).ToList();
         if (allowedLeafBranches.Count > 0) {
-          return allowedLeafBranches.SelectRandom(random);
+          return allowedLeafBranches.SampleRandom(random);
         } else {
           allowedInternalBranches = (from branch in branches
                                      where branch != null && branch.SubtreeCount > 0
                                      select branch).ToList();
-          return allowedInternalBranches.SelectRandom(random);
+          return allowedInternalBranches.SampleRandom(random);
+
         }
       }

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs

@@ -34 +34 @@
   public abstract class SymbolicExpressionTreeCrossover : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCrossover {
     private const string ParentsParameterName = "Parents";
-    private const string ChildParameterName = "Child";
     #region Parameter Properties
     public ILookupParameter<ItemArray<ISymbolicExpressionTree>> ParentsParameter {
       get { return (ScopeTreeLookupParameter<ISymbolicExpressionTree>)Parameters[ParentsParameterName]; }
     }
-    public ILookupParameter<ISymbolicExpressionTree> ChildParameter {
-      get { return (ILookupParameter<ISymbolicExpressionTree>)Parameters[ChildParameterName]; }
-    }
     #endregion
     #region Properties
-    public ItemArray<ISymbolicExpressionTree> Parents {
+    private ItemArray<ISymbolicExpressionTree> Parents {
       get { return ParentsParameter.ActualValue; }
     }
-    public ISymbolicExpressionTree Child {
-      get { return ChildParameter.ActualValue; }
-      set { ChildParameter.ActualValue = value; }
+    private ISymbolicExpressionTree Child {
+      get { return SymbolicExpressionTreeParameter.ActualValue; }
+      set { SymbolicExpressionTreeParameter.ActualValue = value; }
     }
     #endregion
@@ -58 +54 @@
       : base() {
       Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(ParentsParameterName, "The parent symbolic expression trees which should be crossed."));
-      Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(ChildParameterName, "The child symbolic expression tree resulting from the crossover."));
       ParentsParameter.ActualName = "SymbolicExpressionTree";
-      ChildParameter.ActualName = "SymbolicExpressionTree";
     }
 
@@ -67 +61 @@
         throw new ArgumentException("Number of parents must be exactly two for symbolic expression tree crossover operators.");
 
-      ISymbolicExpressionTree result = Crossover(Random, Parents[0], Parents[1]);
+      ISymbolicExpressionTree result = Crossover(RandomParameter.ActualValue, Parents[0], Parents[1]);
 
       Child = result;
@@ -74 +68 @@
 
     public abstract ISymbolicExpressionTree Crossover(IRandom random, ISymbolicExpressionTree parent0, ISymbolicExpressionTree parent1);
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.4
+      #region Backwards compatible code, remove with 3.5
+      if (Parameters.ContainsKey("Child")) {
+        var oldChildParameter = (ILookupParameter<ISymbolicExpressionTree>)Parameters["Child"];
+        Parameters.Remove("Child");
+        SymbolicExpressionTreeParameter.ActualName = oldChildParameter.ActualName;
+      }
+      #endregion
+    }
   }
 }