Changeset 10302 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

01/08/14 13:58:54 (10 years ago)

Author:

bburlacu

Message:

#1772: - Added a ViewHost in the right side of the GenealogyGraphView which displays the encoding-specific content when a GenealogyGraphNode is clicked.

• Migrated new SymbolicExpressionTreeChart (drawing the tree using the ReingoldTilfordLayoutEngine) to the new branch
• Copied SymbolicDataAnalysisExpressionTreeMatching.cs and SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs to the new branch

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Formatters/SymbolicExpressionTreeLatexFormatter.cs (modified) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -12 +13 @@
       {"StartSymbol","RPB"}
     };
-    private ReingoldTilfordLayoutEngine layoutEngine;
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> layoutEngine;
+    private readonly SymbolicExpressionTreeLayoutAdapter layoutAdapter;
+
 
     public SymbolicExpressionTreeLatexFormatter() {
-      layoutEngine = new ReingoldTilfordLayoutEngine();
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
     }
 
     protected SymbolicExpressionTreeLatexFormatter(SymbolicExpressionTreeLatexFormatter original, Cloner cloner)
       : base(original, cloner) {
-      layoutEngine = new ReingoldTilfordLayoutEngine();
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
+      layoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
     }
 
@@ -28 +32 @@
 
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
-      layoutEngine.SymbolicExpressionTree = symbolicExpressionTree;
+      var layoutNodes = layoutAdapter.Convert(symbolicExpressionTree).ToList();
+      layoutEngine.Reset();
+      layoutEngine.Root = layoutNodes[0];
+      foreach (var ln in layoutNodes)
+        layoutEngine.AddNode(ln.Content, ln);
       var nodeCoordinates = layoutEngine.GetNodeCoordinates();
       var sb = new StringBuilder();

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

@@ -186 +186 @@
     <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
     <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
+    <Compile Include="Formatters\SymbolicExpressionTreeLatexFormatter.cs" />
     <Compile Include="Interfaces\IFragment.cs" />
     <Compile Include="Interfaces\ILayoutAdapter.cs" />