Changeset 9246

Timestamp:

02/27/13 13:16:57 (12 years ago)

Author:

bburlacu

Message:

#1772: Removed commented code from TracingSymbolicExpressionTreeManipulator.cs. Updated project file.

Location:

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

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)
• Manipulators/TracingSymbolicExpressionTreeManipulator.cs (modified) (2 diffs)
• Plugin.cs (modified) (1 diff)

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

@@ -172 +172 @@
     <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/TracingSymbolicExpressionTreeManipulator.cs

@@ -95 +95 @@
         GlobalTraceMap[tree] = new ItemList<IItem> { GlobalCloneMap[tree] };
       }
-
-      //      var concreteType = this.GetType();
-
-      //      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
-      //      Manipulate(RandomParameter.ActualValue, tree);
-      //      var nodes1 = tree.IterateNodesBreadth().ToList(); // list of nodes after manipulation
-
       var comparer = SymbolicExpressionTreeNodeComparer;
       var clonedTree = (ISymbolicExpressionTree)tree.Clone();
@@ -114 +104 @@
       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;
-      //          }
-      //        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;
       return base.Apply();

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.9083")]
+  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.3.9237")]
   [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]