Changeset 11925 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

02/05/15 19:35:34 (10 years ago)

Author:

bburlacu

Message:

#1772:

• Removed unused code
• Adapted genealogy graph according to the trunk changes to the directed graph
• Adapted trace calculator and before/after operators
• Introduced a CloneableCollection to help save node lists

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• SymbolGraph (deleted)
• Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs (modified) (1 diff)
• Tracking/TraceCalculator.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -321 +321 @@
     <Compile Include="Tracking\TraceCalculator.cs" />
     <Compile Include="TransformationToSymbolicTreeMapper.cs" />
-    <Compile Include="Tracking\FragmentGraph\FragmentGraph.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs

@@ -49 +49 @@
 
       for (int i = 0; i < parents.Count; ++i) {
-        arcs[i].Data = parents[i].IterateNodesPrefix().ToList();
+        arcs[i].Data = parents[i].IterateNodesPrefix().ToCloneableCollection();
       }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs

@@ -95 +95 @@
         Debug.Assert(si < g.Data.Length);
         var inArcs = (List<IArc>)((IVertex)g).InArcs;
-        var fragment = (IFragment<ISymbolicExpressionTreeNode>)inArcs.Last().Data;
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)((IGenealogyGraphArc)inArcs.Last()).Data;
         if (fragment == null) {
           // TODO: think about what the correct behavior should be here (seems good so far)
@@ -225 +225 @@
   }
   // this class is here to help clarify the semantics
-  public class TraceData : Tuple<int, int, int, int> {
+  public class TraceData : Tuple<int, int, int, int>, IDeepCloneable {
     public TraceData(int currentSubtreeIndex, int currentFragmentIndex, int lastSubtreeIndex, int lastFragmentIndex)
       : base(currentSubtreeIndex, currentFragmentIndex, lastSubtreeIndex, lastFragmentIndex) {
@@ -234 +234 @@
     public int LastSubtreeIndex { get { return Item3; } }
     public int LastFragmentIndex { get { return Item4; } }
+    public object Clone() {
+      return new TraceData(SubtreeIndex, FragmentIndex, LastSubtreeIndex, LastFragmentIndex);
+    }
+
+    public IDeepCloneable Clone(Cloner cloner) {
+      return cloner.Clone(this);
+    }
   }