Changeset 9237

Timestamp:

02/21/13 15:42:21 (12 years ago)

Author:

bburlacu

Message:

#1772: Merged HeuristicLab.Encodings.SymbolicExpressionTreeEncoding trunk changes into the branch. Changed fragments using the tree manipulator are now tracked using the SymbolicExpressionTreeNodeComparer.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (modified) (1 prop)
• 3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs (modified) (1 diff)
• 3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)
• 3.4/Manipulators (modified) (1 prop)
• 3.4/Manipulators/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• 3.4/Manipulators/RemoveBranchManipulation.cs (modified) (1 diff)
• 3.4/Manipulators/ReplaceBranchManipulation.cs (modified) (2 diffs)
• 3.4/Manipulators/TracingSymbolicExpressionTreeManipulator.cs (modified) (3 diffs)
• 3.4/Plugin.cs (modified) (1 diff)
• 3.4/TracingSymbolicExpressionTreeOperator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs

@@ -71 +71 @@
     }
     #endregion
-
     #region Properties
     public bool EnabledByDefault {

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -171 +171 @@
     <Compile Include="Interfaces\IFragment.cs" />
     <Compile Include="Interfaces\Operators\ITracingSymbolicExpressionTreeOperator.cs" />
+    <Compile Include="Manipulators\RemoveBranchManipulation.cs" />
+    <Compile Include="SymbolicExpressionTreeTextRenderer.cs" />
     <Compile Include="TracingSymbolicExpressionTreeOperator.cs" />
     <Compile Include="Creators\TracingSymbolicExpressionTreeCreator.cs" />

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/RemoveBranchManipulation.cs

@@ -31 +31 @@
   [StorableClass]
   [Item("RemoveBranchManipulation", "Removes a random sub-tree of the input tree and fixes the tree by generating random subtrees if necessary..")]
-  public sealed class RemoveBranchManipulation : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
+  public sealed class RemoveBranchManipulation : TracingSymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
     private const int MAX_TRIES = 100;
     private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -26 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/TracingSymbolicExpressionTreeManipulator.cs

@@ -65 +65 @@
       manipulationTypes.Add(typeof(ChangeNodeTypeManipulation), ManipulationType.ChangeNodeTypeManipulation);
       manipulationTypes.Add(typeof(ReplaceBranchManipulation), ManipulationType.ReplaceBranchManipulation);
+      manipulationTypes.Add(typeof(RemoveBranchManipulation), ManipulationType.RemoveBranchManipulation);
     }
 
@@ -95 +96 @@
       }
 
-      var concreteType = this.GetType();
+      //      var concreteType = this.GetType();
 
-      if (!manipulationTypes.ContainsKey(concreteType))
-        throw new Exception(this.Name + ": Unknown manipulation type (key not found in the dictionary).");
+      //      if (!manipulationTypes.ContainsKey(concreteType))
+      //        throw new Exception(this.Name + ": Unknown manipulation type (key not found in the dictionary).");
 
-      var nodes0 = tree.IterateNodesBreadth().ToList(); // list of nodes before manipulation
+      //      var nodes0 = tree.IterateNodesBreadth().ToList(); // list of nodes before manipulation
+      //      Manipulate(RandomParameter.ActualValue, tree);
+      //      var nodes1 = tree.IterateNodesBreadth().ToList(); // list of nodes after manipulation
+
+      var comparer = SymbolicExpressionTreeNodeComparer;
+      var clonedTree = (ISymbolicExpressionTree)tree.Clone();
+      var nodes0 = clonedTree.IterateNodesBreadth().ToList();
       Manipulate(RandomParameter.ActualValue, tree);
-      var nodes1 = tree.IterateNodesBreadth().ToList(); // list of nodes after manipulation
+      var nodes1 = tree.IterateNodesBreadth().ToList();
+
       int min = Math.Min(nodes0.Count, nodes1.Count);
+      int i = 0; while (i != min && comparer.Equals(nodes0[i], nodes1[i])) ++i;
+      fragment = new Fragment(i == min ? null : nodes1[i], 1);
+      GlobalFragmentMap[tree] = fragment;
 
-      switch (manipulationTypes[concreteType]) {
-        case ManipulationType.FullTreeShaker: {
-            // the FullTreeShaker changes the local parameters of all the nodes in the tree
-            // therefore, the whole tree is considered to be the fragment
-            fragment = new Fragment(tree.Root.GetSubtree(0).GetSubtree(0));
-            break;
-          }
-        case ManipulationType.OnePointShaker: {
-            var original = (ISymbolicExpressionTree)GlobalCloneMap[tree];
-            var nodesOriginal = original.IterateNodesBreadth().ToList();
-            int i = 0;
-            var comparer = SymbolicExpressionTreeNodeComparer;
-            while (i != min && comparer.Equals(nodesOriginal[i], nodes1[i])) ++i;
-            fragment = new Fragment(i == min ? null : nodes1[i], 1);
-            break;
-          }
-        case ManipulationType.ChangeNodeTypeManipulation: {
-            int i = 0;
-            while (i != min && ReferenceEquals(nodes0[i], nodes1[i])) ++i;
-            fragment = new Fragment(i == min ? null : nodes1[i], 1);
-            break;
-          }
-        case ManipulationType.ReplaceBranchManipulation: {
-            int i = 0;
-            while (i != min && ReferenceEquals(nodes0[i], nodes1[i])) ++i;
-            fragment = new Fragment(i == min ? null : nodes1[i]);
-            break;
-          }
-        default:
-          throw new Exception(Name + ": Unknown manipulaton type.");
-      }
+
+
+      //      switch (manipulationTypes[concreteType]) {
+      //        case ManipulationType.FullTreeShaker: {
+      //            // the FullTreeShaker changes the local parameters of all the nodes in the tree
+      //            // therefore, the whole tree is considered to be the fragment
+      //            fragment = new Fragment(tree.Root.GetSubtree(0).GetSubtree(0));
+      //            break;
+      //          }
+      //        case ManipulationType.OnePointShaker: {
+      //            var original = (ISymbolicExpressionTree)GlobalCloneMap[tree];
+      //            var nodesOriginal = original.IterateNodesBreadth().ToList();
+      //            int i = 0;
+      //            var comparer = SymbolicExpressionTreeNodeComparer;
+      //            while (i != min && comparer.Equals(nodesOriginal[i], nodes1[i])) ++i;
+      //            fragment = new Fragment(i == min ? null : nodes1[i], 1);
+      //            break;
+      //          }
+      //        case ManipulationType.ChangeNodeTypeManipulation: {
+      //            int i = 0;
+      //            while (i != min && ReferenceEquals(nodes0[i], nodes1[i])) ++i;
+      //            fragment = new Fragment(i == min ? null : nodes1[i], 1);
+      //            break;
+      //          }
+      //        case ManipulationType.ReplaceBranchManipulation: {
+      //            int i = 0;
+      //            while (i != min && ReferenceEquals(nodes0[i], nodes1[i])) ++i;
+      //            fragment = new Fragment(i == min ? null : nodes1[i]);
+      //            break;
+      //          }
+      //        case ManipulationType.RemoveBranchManipulation: {
+      //            int i = 0;
+      //            while (i != min && ReferenceEquals(nodes0[i], nodes1[i])) ++i;
+      //            fragment = new Fragment(i == min ? null : nodes1[i]);
+      //            break;
+      //          }
+      //        default:
+      //          throw new Exception(Name + ": Unknown manipulaton type.");
+      //      }
 
       GlobalFragmentMap[tree] = fragment;
@@ -148 +167 @@
       public const byte ChangeNodeTypeManipulation = 3;
       public const byte ReplaceBranchManipulation = 4;
+      public const byte RemoveBranchManipulation = 5;
     }
   }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.3.8557")]
+  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.3.9083")]
   [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/TracingSymbolicExpressionTreeOperator.cs

@@ -67 +67 @@
       if (!Parameters.ContainsKey(GlobalGeneticExchangeMapParameterName))
         Parameters.Add(new LookupParameter<GeneticExchangeMapType>(GlobalGeneticExchangeMapParameterName, "A global list of genetic exchange transactions."));
+      if (!Parameters.ContainsKey(SymbolicExpressionTreeNodeComparerParameterName))
+        Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
     }