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

Timestamp:

07/30/14 01:41:54 (10 years ago)

Author:

bburlacu

Message:

#1772: Worked towards integrating the new graph api with the tracking operators.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (3 diffs)
• SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionBeforeManipulatorOperator.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionTracing.cs (modified) (6 diffs)

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

@@ -176 +176 @@
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisGenealogyAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicDataAnalysisPopulationDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" />
@@ -190 +189 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DirectedGraph\Arc.cs" />
-    <Compile Include="DirectedGraph\DirectedGraph.cs" />
-    <Compile Include="DirectedGraph\Interfaces\IArc.cs" />
-    <Compile Include="DirectedGraph\Interfaces\IDirectedGraph.cs" />
-    <Compile Include="DirectedGraph\Interfaces\IVertex.cs" />
-    <Compile Include="DirectedGraph\Vertex.cs" />
     <Compile Include="Interfaces\IModelBacktransformator.cs" />
     <Compile Include="Interfaces\IDistanceCalculator.cs" />
@@ -213 +206 @@
     <Compile Include="SlidingWindow\SlidingWindowQualitiesAnalyzer.cs" />
     <Compile Include="SlidingWindow\SlidingWindowVisualizer.cs" />
-    <Compile Include="SymbolGraph\FPGraph.cs" />
-    <Compile Include="SymbolGraph\SymbolGraph.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs" />

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

@@ -235 +235 @@
       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
       Operators.Add(new BottomUpSimilarityCalculator());
+      Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
       ParameterizeOperators();
     }
@@ -361 +362 @@
         op.SimilarityCalculator = operators.OfType<BottomUpSimilarityCalculator>().SingleOrDefault();
       }
+      // add tracking analyzer
+      foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
+        op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
+        op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
+        op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
+        op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
+        // get crossover parameter names
+        var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();
+        if (crossover != null) {
+          op.BeforeCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
+          op.AfterCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
+          op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
+          op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
+        }
+        // get manipulator parameter names
+        var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().FirstOrDefault();
+        if (manipulator != null) {
+          op.BeforeManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
+          op.AfterManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
+        }
+        var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
+        if (creator != null) {
+          op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
+        }
+      }
     }
 

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

@@ -30 +30 @@
   public class SymbolicDataAnalysisExpressionAfterCrossoverOperator : AfterCrossoverOperator<ISymbolicExpressionTree> {
     public override IOperation Apply() {
-      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetVertex(ChildParameter.ActualValue);
+      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetByContent(ChildParameter.ActualValue);
       var arcs = childVertex.InArcs.ToList();
       var nodes0 = (List<ISymbolicExpressionTreeNode>)arcs[0].Data;

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

@@ -40 +40 @@
 
     public override IOperation Apply() {
-      var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetVertex(ChildParameter.ActualValue);
+      var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetByContent(ChildParameter.ActualValue);
       var nodesBefore = (List<ISymbolicExpressionTreeNode>)vChild.InArcs.First().Data;
       var nodesAfter = ChildParameter.ActualValue.IterateNodesPrefix().ToList();

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

@@ -30 +30 @@
       var result = base.Apply(); // the base operator will add the child to the graph before the actual crossover operation takes place
       var parents = ParentsParameter.ActualValue.ToList();
-      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetVertex(parents[0]); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
+      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetByContent(parents[0]); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
       var arcs = childVertex.InArcs.ToList();
 

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

@@ -30 +30 @@
       var result = base.Apply(); // add the vertex in the genealogy graph
 
-      var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetVertex(ChildParameter.ActualValue);
+      var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph.GetByContent(ChildParameter.ActualValue);
       var vClone = vChild.Parents.Last();
       vChild.InArcs.First().Data = vClone.Content.IterateNodesPrefix().ToList();

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

@@ -30 +30 @@
   public static class SymbolicDataAnalysisExpressionTracing {
     public static FragmentGraph TraceSubtree(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, int subtreeIndex) {
-      var graph = new FragmentGraph { AllowDuplicateContent = true };
+      var graph = new FragmentGraph();
       var nodes = Trace(graphNode, subtreeIndex);
       foreach (var n in nodes) {
@@ -51 +51 @@
       while (true) {
         if (!node.Parents.Any()) {
-          var fragmentNode = new FragmentNode {
-            Content = node,
+          var fragmentNode = new FragmentNode(node) {
             SubtreeIndex = index,
           };
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
-            parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(arc);
+            parent.AddArc(arc);
+            fragmentNode.AddArc(arc);
+
+            //            parent.AddForwardArc(arc);
+            //            fragmentNode.AddReverseArc(arc);
           }
           yield return fragmentNode; // no tracing if there are no parents
@@ -79 +81 @@
         if (parents.Count == 1) {
           // we are tracing a mutation operation
-          var fragmentNode = new FragmentNode {
-            Content = node,
+          var fragmentNode = new FragmentNode(node) {
             SubtreeIndex = index,
             FragmentIndex = fragment.Index1
@@ -86 +87 @@
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
-            parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(arc);
+            parent.AddArc(arc);
+            fragmentNode.AddArc(arc);
           }
           node = parents[0];
@@ -138 +139 @@
             if (fragment.Index1 < index + subtreeLength) {
               // subtree contains fragment => bifurcation point in the fragment graph
-              var fragmentNode = new FragmentNode {
-                Content = node,
+              var fragmentNode = new FragmentNode(node) {
                 SubtreeIndex = index,
                 FragmentIndex = fragment.Index1
@@ -145 +145 @@
               if (parent != null) {
                 var arc = new Arc(parent, fragmentNode);
-                parent.AddForwardArc(arc);
-                fragmentNode.AddReverseArc(arc);
+                parent.AddArc(arc);
+                fragmentNode.AddArc(arc);
               }
               yield return fragmentNode;