Changeset 11852

Timestamp:

02/01/15 23:17:56 (9 years ago)

Author:

bburlacu

Message:

#1772: Added some useful functionality to the GenealogyGraphView.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.EvolutionTracking.Tests/GenealogyOperationsPerformanceTests.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (6 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs (modified) (6 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Fragment.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman (modified) (1 prop)
• HeuristicLab.Problems.TravelingSalesman.Views (modified) (1 prop)
• HeuristicLab.Tracking.sln (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Tests/GenealogyOperationsPerformanceTests.cs

@@ -48 +48 @@
       //      var trace = tc.Trace(bestIndividual, 2);
       sw.Stop();
-      Console.WriteLine("Avg trace size: {0}", s / graph.Ranks.Last().Value.Count);
+      Console.WriteLine("Avg trace size: {0}", s / graph.Ranks.Last().Value.Count());
       //      var ancestry = bestIndividual.Ancestors;
       //      Console.WriteLine("Ancestry size: {0}", ancestry.Count());

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

@@ -40 +40 @@
     private readonly Pen defaultPen;
 
+    private Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode> nodeMap;
+    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> arcMap;
+
     public IGenealogyGraph GenealogyGraph {
       get { return genealogyGraph; }
@@ -63 +66 @@
     }
 
-    private Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode> nodeMap;
-    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> arcMap;
+    public bool UpdateEnabled {
+      get { return Chart.UpdateEnabled; }
+      set { Chart.UpdateEnabled = value; }
+    }
+
+    public void EnforceUpdate() {
+      Chart.EnforceUpdate();
+    }
 
     #region chart modes
@@ -225 +234 @@
 
       // update
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
+      UpdateEnabled = true;
+      EnforceUpdate();
 
       if (SelectedVisualNode != null)
-        /* emit clicked event */
-        OnGenealogyGraphNodeClicked(SelectedVisualNode, e);
+        OnGenealogyGraphNodeClicked(SelectedVisualNode, e); // emit clicked event
 
       base.pictureBox_MouseUp(sender, e);
@@ -306 +314 @@
     }
 
+    public void ClearArcs() {
+      foreach (var primitive in Chart.Group.Primitives.OfType<VisualGenealogyGraphArc>()) {
+        primitive.Pen = Pens.Transparent;
+      }
+    }
+
+    public void ClearNodes() {
+      foreach (var primitive in Chart.Group.Primitives.OfType<VisualGenealogyGraphNode>()) {
+        primitive.Brush = new SolidBrush(Color.Transparent);
+        primitive.Pen = new Pen(Color.LightGray);
+      }
+    }
+
     public virtual void ClearPrimitives() {
       foreach (var primitive in Chart.Group.Primitives) {
@@ -313 +334 @@
           primitive.Brush = new SolidBrush(Color.Transparent);
           primitive.Pen = new Pen(Color.DarkGray);
-        }
-      }
-    }
-
-    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes) {
-      Chart.UpdateEnabled = false;
-      ClearPrimitives();
+          //          primitive.Pen = Pens.Transparent; // remove the node contour
+        }
+      }
+    }
+
+    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes, bool clearPrimitives = true) {
+      if (clearPrimitives)
+        ClearPrimitives();
+
       foreach (var node in nodes) {
         var graphNode = GetMappedNode(node);
         graphNode.Brush = new SolidBrush(node.GetColor());
       }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
+    }
+
+    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes, Color color, bool clearPrimitives = true) {
+      if (clearPrimitives)
+        ClearPrimitives();
+
+      foreach (var node in nodes.Select(GetMappedNode)) {
+        node.Brush = new SolidBrush(color);
+      }
     }
 
     public void HighlightAll() {
-      Chart.UpdateEnabled = false;
       foreach (var visualNode in nodeMap.Values) {
         visualNode.Brush = new SolidBrush(visualNode.Data.GetColor());
@@ -340 +369 @@
         arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
       }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
     }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs

@@ -26 +26 @@
     private void InitializeComponent() {
       this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.groupBox = new System.Windows.Forms.GroupBox();
@@ -31 +32 @@
       this.simpleLineages_checkBox = new System.Windows.Forms.CheckBox();
       this.trace_checkBox = new System.Windows.Forms.CheckBox();
-      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
+      this.openNew_CheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -58 +59 @@
       this.splitContainer.TabIndex = 0;
       // 
+      // genealogyGraphChart
+      // 
+      this.genealogyGraphChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
+      this.genealogyGraphChart.GenealogyGraph = null;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
+      this.genealogyGraphChart.LockGenealogy = false;
+      this.genealogyGraphChart.Name = "genealogyGraphChart";
+      this.genealogyGraphChart.ScaleOnResize = true;
+      this.genealogyGraphChart.SimpleLineages = false;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
+      this.genealogyGraphChart.TabIndex = 0;
+      this.genealogyGraphChart.TraceFragments = false;
+      this.genealogyGraphChart.UpdateEnabled = true;
+      // 
       // viewHost
       // 
@@ -77 +95 @@
       // groupBox
       // 
+      this.groupBox.Controls.Add(this.openNew_CheckBox);
       this.groupBox.Controls.Add(this.lockGraph_checkBox);
       this.groupBox.Controls.Add(this.simpleLineages_checkBox);
@@ -123 +142 @@
       this.trace_checkBox.CheckedChanged += new System.EventHandler(this.trace_checkBox_CheckedChanged);
       // 
-      // genealogyGraphChart
+      // openNew_CheckBox
       // 
-      this.genealogyGraphChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
-      this.genealogyGraphChart.GenealogyGraph = null;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
-      this.genealogyGraphChart.LockGenealogy = false;
-      this.genealogyGraphChart.Name = "genealogyGraphChart";
-      this.genealogyGraphChart.ScaleOnResize = true;
-      this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
-      this.genealogyGraphChart.TabIndex = 0;
-      this.genealogyGraphChart.TraceFragments = false;
+      this.openNew_CheckBox.AutoSize = true;
+      this.openNew_CheckBox.Location = new System.Drawing.Point(237, 20);
+      this.openNew_CheckBox.Name = "openNew_CheckBox";
+      this.openNew_CheckBox.Size = new System.Drawing.Size(111, 17);
+      this.openNew_CheckBox.TabIndex = 1;
+      this.openNew_CheckBox.Text = "Open in new view";
+      this.openNew_CheckBox.UseVisualStyleBackColor = true;
       // 
       // GenealogyGraphView
@@ -166 +179 @@
     protected System.Windows.Forms.CheckBox simpleLineages_checkBox;
     protected System.Windows.Forms.CheckBox lockGraph_checkBox;
+    protected System.Windows.Forms.CheckBox openNew_CheckBox;
 
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj

@@ -129 +129 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GenealogyGraphView.resx">
+      <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Fragment.cs

@@ -19 +19 @@
       set { root = value; }
     }
-
     [StorableConstructor]
     protected Fragment(bool deserializable) : base(deserializable) { }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -154 +154 @@
       sb.AppendLine("graph fragmentgraph {");
       foreach (var v in Vertices) {
-        sb.AppendLine("\"" + v.Id + "\"[shape=circle, style = filled, width = " + v.Degree / 2.0 + ", label = " + v.Rank + ", fillcolor = \"" + ColorTranslator.ToHtml(GetColor(v)) + "\"]");
+        double width = Math.Max(0.5, v.Degree);
+        sb.AppendLine("\"" + v.Id + "\"[shape=circle, style = filled, width = " + width + ", label = " + v.Rank + "\n" + String.Format("{0:00}", v.Quality) + ", fillcolor = \"" + ColorTranslator.ToHtml(GetColor(v)) + "\"]");
       }
       foreach (var a in Arcs) {
@@ -167 +168 @@
       if (colorIndex >= ColorGradient.Colors.Count) return ColorGradient.Colors.Last();
       return ColorGradient.Colors[colorIndex];
+    }
+
+    public override void AddVertices(IEnumerable<IVertex> vertexList) {
+      base.AddVertices(vertexList);
+      RebuildDictionaries();
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs

@@ -62 +62 @@
       get { return InArcs.Select(a => a.Source); }
     }
+
     public IEnumerable<IGenealogyGraphNode> Children {
       get { return OutArcs.Select(a => a.Target); }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

@@ -132 +132 @@
         Content.Fixed = true;
         DeregisterContentEvents();
-        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
+        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value);
+        Content.AllVariableNames = variableNamesView.Content.Select(x => x.Value);
         RegisterContentEvents();
       }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
@@ -72 +73 @@
       var visualNode = (VisualGenealogyGraphNode)sender;
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)visualNode.Data;
+
+      if (openNew_CheckBox.Checked) {
+        // get the ancestors into a new view
+        var cloner = new Cloner();
+
+        var graph = new GenealogyGraph<ISymbolicExpressionTree>();
+        var ancestors = new[] { graphNode }.Concat(graphNode.Ancestors);
+        var cloned = ancestors.ToDictionary(x => x, x => cloner.Clone(x));
+        graph.AddVertices(cloned.Values);
+        foreach (var arc in cloned.Keys.SelectMany(x => x.InArcs)) {
+          graph.AddArc(cloner.Clone(arc));
+        }
+        //        graph.AddVertices(graphNode.Ancestors);
+        MainFormManager.MainForm.ShowContent(graph);
+      }
+
       if (graphNode.InArcs.Any()) {
         var fragment = graphNode.InArcs.Last().Data as IFragment<ISymbolicExpressionTreeNode>;
@@ -92 +109 @@
       var visualNode = (VisualTreeNode<ISymbolicExpressionTreeNode>)sender;
       var subtree = visualNode.Content;
-
       // highlight the selected subtree inside the displayed tree on the right hand side
       treeChart_ClearColors();
@@ -103 +119 @@
         var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
         var subtreeIndex = graphNode.Data.IterateNodesPrefix().ToList().IndexOf(subtree);
-        //        var fragmentGraph = SymbolicDataAnalysisExpressionTracing.TraceSubtree(graphNode, subtreeIndex);
         var traceGraph = TraceCalculator.TraceSubtree(graphNode, subtreeIndex);
-
         if (traceGraph.Vertices.Any()) {
+          genealogyGraphChart.UpdateEnabled = false;
+          genealogyGraphChart.ClearArcs();
+          //          genealogyGraphChart.ClearPrimitives();
           var genealogyNodes = traceGraph.Vertices.Select(v => Content.GetByContent(v.Data));
-          genealogyGraphChart.HighlightNodes(genealogyNodes);
-          foreach (var a in traceGraph.Arcs) {
-            genealogyGraphChart.HighlightArc(Content.GetByContent(a.Target.Data), Content.GetByContent(a.Source.Data));
-          }
+          //          genealogyGraphChart.HighlightNodes(graphNode.Ancestors, Color.Gray, false);
+          genealogyGraphChart.HighlightNodes(genealogyNodes, Color.Black, false);
+          //          foreach (var a in traceGraph.Arcs) {
+          //            genealogyGraphChart.HighlightArc(Content.GetByContent(a.Target.Data), Content.GetByContent(a.Source.Data));
+          //          }
+          genealogyGraphChart.UpdateEnabled = true;
+          genealogyGraphChart.EnforceUpdate();
           MainFormManager.MainForm.ShowContent(traceGraph); // display the fragment graph on the screen
         }
@@ -121 +141 @@
 
         var matchingVertices = matchingTrees.Select(x => Content.GetByContent(x));
-        graphChart_highlightMatchingVertices(matchingVertices);
+        graphChart_HighlightMatchingVertices(matchingVertices);
       }
     }
 
-    private void graphChart_highlightMatchingVertices(IEnumerable<IGenealogyGraphNode> vertices) {
+    private void graphChart_HighlightMatchingVertices(IEnumerable<IGenealogyGraphNode> vertices) {
       genealogyGraphChart.Chart.UpdateEnabled = false;
       genealogyGraphChart.ClearPrimitives();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -36 +37 @@
   [StorableClass]
   public abstract class SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<T, U> : SymbolicDataAnalysisSingleObjectiveAnalyzer,
-    ISymbolicDataAnalysisValidationAnalyzer<T, U>
+    ISymbolicDataAnalysisValidationAnalyzer<T, U>, IStochasticOperator
     where T : class, ISymbolicDataAnalysisSingleObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {

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

@@ -45 +45 @@
       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.GetByContent(parents[0]); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
+      var childVertex = 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/TraceCalculator.cs

@@ -204 +204 @@
         return;
       var lastTraceData = traceMap[last];
-      int lastSi = lastTraceData.Item1; // last subtree index
-      int lastFi = lastTraceData.Item2; // last fragment index
+      int lastSi = lastTraceData.Item1; // last subtree index (index of the traced subtree in the parent)
+      int lastFi = lastTraceData.Item2; // last fragment index (index of the fragment in the parent)
       var td = new Tuple<int, int, int, int>(si, fi, lastSi, lastFi); // trace data
       var arc = n.InArcs.SingleOrDefault(a => a.Source == last && a.Data.Equals(td));

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Tracking.sln

@@ -184 +184 @@
     HideSolutionNode = FALSE
   EndGlobalSection
-  GlobalSection(Performance) = preSolution
-    HasPerformanceSessions = true
-  EndGlobalSection
   GlobalSection(TestCaseManagementSettings) = postSolution
     CategoryFile = HeuristicLab.Tracking.vsmdi