Changeset 10822 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

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

Author:

bburlacu

Message:

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

Location:

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

Files:

• SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• Tracking/SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs (modified) (1 diff)

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;