Changeset 10822

Timestamp:

05/07/14 17:15:34 (11 years ago)

Author:

bburlacu

Message:

#1772: Partially fixed fragment detection and tracing in the case of mutation.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

@@ -50 +50 @@
       if (GenealogyGraph.Contains(ChildParameter.ActualValue)) {
         // if the graph already contains a vertex representing the child, it means that the child is a product of crossover
-        // when mutation follows after crossover, some changes need to be made
+        // when mutation follows after crossover, some changes need to be made to the graph to maintain consistency
         var child = ChildParameter.ActualValue;
         var clone = (T)child.Clone();
@@ -58 +58 @@
         // adjust parent-child(clone) relationship in the graph
         var parents = vChild.Parents;
-        // if there's a fragment, save it 
-        vChild.InArcs = new List<IGenealogyGraphArc>();
         foreach (var p in parents) {
           foreach (var a in p.OutArcs.Where(a => a.Target == vChild)) {
@@ -66 +64 @@
           vClone.AddReverseArc(p);
         }
+        vClone.InArcs.Last().Data = vChild.InArcs.Last().Data;
+        vChild.InArcs = new List<IGenealogyGraphArc>();
         vChild.AddReverseArc(vClone);
         vClone.AddForwardArc(vChild);
-        vClone.InArcs.Last().Data = vChild.InArcs.Last().Data;
-
       } else { // this needs to be checked
         var vChild = new GenealogyGraphNode<T> { Content = ChildParameter.ActualValue, Rank = Generations.Value };

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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.EvolutionTracking;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -358 +357 @@
         op.BeforeCrossoverOperator = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
         op.AfterCrossoverOperator = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
-        op.BeforeManipulatorOperator = new BeforeManipulatorOperator<ISymbolicExpressionTree>();
-        op.AfterManipulatorOperator = new AfterManipulatorOperator<ISymbolicExpressionTree>();
+        op.BeforeManipulatorOperator = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
+        op.AfterManipulatorOperator = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
         // get crossover parameter names
         var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();

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

@@ -30 +30 @@
         fragment = new Fragment<ISymbolicExpressionTreeNode> {
           Root = a,
-          Index1 = i
+          Index1 = i,
+          Index2 = i
         };
+        break;
       }
+
+      //      if (fragment == null) {
+      //        throw new Exception("SymbolicDataAnalysisExpressionAfterManipulatorOperator: Could not identify fragment");
+      //      }
 
       vChild.InArcs.First().Data = fragment;