Changeset 13789

Timestamp:

04/24/16 20:37:12 (8 years ago)

Author:

bburlacu

Message:

#2288:

• Refactor RunCollectionVariableInteractionNetworkView improving functionality, modularity and code organisation.
• Small tweaks to the DirectedGraphChart and DirectedGraphChartMode

Location:

branches/HeuristicLab.VariableInteractionNetworks

Files:

• HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.Designer.cs (modified) (1 diff)
• HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs (modified) (5 diffs)
• HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChartMode.cs (modified) (4 diffs)
• HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.Designer.cs (modified) (3 diffs)
• HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs (modified) (5 diffs)
• HeuristicLab.VariableInteractionNetworks/3.3/HeuristicLab.VariableInteractionNetworks-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.Designer.cs

@@ -32 +32 @@
       // pictureBox
       // 
-      this.pictureBox.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox.Image")));
+      //this.pictureBox.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox.Image")));
       // 
       // toolTip

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs

@@ -83 +83 @@
       this.AddChartModes(directedGraphChartMode, new PanChartMode(this), new ZoomInChartMode(this), new ZoomOutChartMode(this));
       shapes = new Dictionary<Type, LabeledPrimitive>();
+      SmoothingMode = SmoothingMode.HighQuality; // set antialiasing for nicer rendering
     }
 
@@ -110 +111 @@
       foreach (var v in graph.Vertices) {
         var shape = CreateShape(v);
+        shape.ToolTipText = v.Label;
         vertexMap[shape] = v;
         vertexShapes[v] = shape;
@@ -152 +154 @@
         var len = points.Length; // len = 2 when no edge routingMode is performed
         Pen pen;
+        var penWidth = weight / max * 2;
         if (len == 2) {
-          pen = new Pen(Color.Black, (float)(weight / max * 3f)) { CustomEndCap = new AdjustableArrowCap(5, 3) };
+          if (double.IsInfinity(penWidth) || double.IsNaN(penWidth)) penWidth = 1;
+          pen = new Pen(Color.Black, (float)penWidth) { CustomEndCap = new AdjustableArrowCap(5, 3) };
           var start = points[0];
           var end = points[1];
@@ -168 +172 @@
           if (intersectionPoint == default(PointD))
             intersectionPoint = end;
-          line = new Line(Chart, new PointD(start.X, start.Y), intersectionPoint, pen);
+          line = new Line(Chart, new PointD(start.X, start.Y), intersectionPoint, pen) { ToolTipText = arc.Label };
           Chart.Group.Add(line);
           arcShapes[arc] = line;
@@ -193 +197 @@
             if (intersectionPoints.Any()) {
               endPoint = intersectionPoints.First();
-              pen = new Pen(Color.Black, (float)(weight / max * 3f)) { CustomEndCap = new AdjustableArrowCap(5, 3) };
+              pen = new Pen(Color.Black, (float)penWidth) { CustomEndCap = new AdjustableArrowCap(5, 3) };
             } else {
               endPoint = end;
-              pen = new Pen(Color.Black, (float)(weight / max * 3f));
+              pen = new Pen(Color.Black, (float)penWidth);
             }
-            line = new Line(Chart, new PointD(start.X, start.Y), endPoint, pen);
+            line = new Line(Chart, new PointD(start.X, start.Y), endPoint, pen) { ToolTipText = arc.Label };
             Chart.Group.Add(line);
             if (intersectionPoints.Any()) {

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChartMode.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Visualization;
 
@@ -56 +55 @@
                 }
               }
-            } finally { chartControl.ResumeRendering(); }
+            }
+            finally { chartControl.ResumeRendering(); }
             break;
         }
-      } finally {
+      }
+      finally {
         base.HandleOnMouseDown(sender, e);
       }
@@ -67 +68 @@
       try {
         switch (e.Button) {
-          case MouseButtons.None:
-            try {
-              chartControl.SuspendRendering();
-              var sp = chartControl.Chart.GetPrimitive(e.Location);
-              if (sp is RectangularPrimitiveBase) {
-                var vertex = Control.GetVertex(sp) as IVertex<IDeepCloneable>;
-                var junctionNode = vertex as JunctionNetworkNode;
-                if (junctionNode != null) {
-                  var solution = vertex.Data as IRegressionSolution;
-                  if (solution != null) {
-                    var toolTip = string.Format("Target: {0}\nQuality: {1}", solution.ProblemData.TargetVariable, solution.TrainingRSquared);
-                    Control.ToolTip.SetToolTip(Control, toolTip);
-                  }
-                }
-              }
-            } finally { chartControl.ResumeRendering(); }
-            break;
           case MouseButtons.Left:
             var previousWorldLocation = chartControl.Chart.TransformPixelToWorld(previousLocation);
@@ -119 +103 @@
                 }
               }
-            } finally { chartControl.ResumeRendering(); }
+            }
+            finally { chartControl.ResumeRendering(); }
             break;
         }
-      } finally {
-        chartControl.UpdatePicture();
+      }
+      finally {
         base.HandleOnMouseMove(sender, e);
       }

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.Designer.cs

@@ -50 +50 @@
       // settingsGroupBox
       // 
-      this.settingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.settingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
       this.settingsGroupBox.Controls.Add(this.onlineImpactCalculationButton);
@@ -169 +169 @@
       // layoutOptionsGroupBox
       // 
-      this.layoutOptionsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.layoutOptionsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
       this.layoutOptionsGroupBox.Controls.Add(this.idealEdgeLengthTextBox);
@@ -230 +230 @@
       // graphChart
       // 
-      this.graphChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.graphChart.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.graphChart.BackColor = System.Drawing.SystemColors.Control;

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs

@@ -233 +233 @@
           IVertex junctionNode;
           if (!nodes.TryGetValue(junctionLabel, out junctionNode)) {
-            junctionNode = new JunctionNetworkNode { Label = string.Empty, Data = CreateEnsembleSolution(targetRuns) };
+            var solutionsEnsemble = CreateEnsembleSolution(targetRuns);
+            junctionNode = new JunctionNetworkNode { Label = string.Empty, Data = solutionsEnsemble };
             vn.AddVertex(junctionNode);
             nodes[junctionLabel] = junctionNode;
+            junctionNode.Label = string.Format("Target quality: {0:0.000}", solutionsEnsemble.TrainingRSquared);
           }
           IArc arc;
@@ -245 +247 @@
               nodes[v] = variableNode;
             }
-            arc = new Arc(variableNode, junctionNode) { Weight = impact };
+            arc = new Arc(variableNode, junctionNode) { Weight = impact, Label = string.Format("Impact: {0:0.000}", impact) };
             vn.AddArc(arc);
           }
-          arc = new Arc(junctionNode, targetNode) { Weight = junctionNode.InArcs.Sum(x => x.Weight) };
+          var trainingR2 = ((IRegressionSolution)((JunctionNetworkNode)junctionNode).Data).TrainingRSquared;
+          arc = new Arc(junctionNode, targetNode) { Weight = junctionNode.InArcs.Sum(x => x.Weight), Label = string.Format("Quality: {0:0.000}", trainingR2) };
           vn.AddArc(arc);
         } else {
@@ -258 +261 @@
               nodes[v] = variableNode;
             }
-            var arc = new Arc(variableNode, targetNode) { Weight = impact };
+            var arc = new Arc(variableNode, targetNode) { Weight = impact, Label = string.Format("Impact: {0:0.000}", impact) };
             vn.AddArc(arc);
           }
@@ -380 +383 @@
       var filteredNetwork = new VariableInteractionNetwork();
       var cloner = new Cloner();
-      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone); // arcs are not cloned
+      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone).Distinct(); // arcs are not cloned
       filteredNetwork.AddVertices(vertices);
-      foreach (var arc in arcs) {
-        var source = cloner.Clone(arc.Source);
-        var target = cloner.Clone(arc.Target);
-        filteredNetwork.AddArc(source, target);
-      }
+      filteredNetwork.AddArcs(arcs.Select(x => (IArc)x.Clone(cloner)));
+
       var unusedJunctions = filteredNetwork.Vertices.Where(x => x.InDegree == 0 && x is JunctionNetworkNode).ToList();
       filteredNetwork.RemoveVertices(unusedJunctions);
@@ -443 +443 @@
         button.Enabled = false;
         var impacts = CalculateVariableImpactsOnline(Content, false);
-        var network = CreateNetwork(impacts);
+        variableInteractionNetwork = CreateNetwork(impacts);
         var threshold = double.Parse(impactThresholdTextBox.Text);
-        graphChart.Graph = ApplyThreshold(network, threshold);
+        graphChart.Graph = ApplyThreshold(variableInteractionNetwork, threshold);
       };
       worker.RunWorkerCompleted += (o, e) => button.Enabled = true;

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/HeuristicLab.VariableInteractionNetworks-3.3.csproj

@@ -166 +166 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SymbolicDataAnalysisVariableImpactsAnalyzer.cs" />
+    <Compile Include="TinySet.cs" />
     <Compile Include="VariableInteractionNetwork.cs" />
   </ItemGroup>