Changeset 13893

Timestamp:

06/14/16 17:12:51 (8 years ago)

Author:

bburlacu

Message:

#2288: Simplify and optimize code for cluster identification in ConstrainedForceDirectedLayout.cs. Introduce a TrackBar for adjusting network threshold in the RunCollectionVariableInteractionNetworkView. Minor improvements to the DirectedGraphChart (work in progress).

Location:

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3

Files:

• DirectedGraphChart.Designer.cs (modified) (1 diff)
• DirectedGraphChart.cs (modified) (6 diffs)
• HeuristicLab.VariableInteractionNetworks.Views-3.3.csproj (modified) (1 diff)
• Layout/ConstrainedForceDirectedLayout.cs (modified) (3 diffs)
• RunCollectionVariableInteractionNetworkView.Designer.cs (modified) (12 diffs)
• RunCollectionVariableInteractionNetworkView.cs (modified) (5 diffs)
• RunCollectionVariableInteractionNetworkView.resx (added)

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

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

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

@@ -159 +159 @@
         Pen pen;
         var penWidth = weight / max * 3;
-        //var penColor = colors[(int)Math.Min(255, weight / max * 255)];
-        var penColor = Color.Black;
+        var colorIndex = (int)Math.Min(255, weight / max * 255);
+        if (colorIndex < 0) colorIndex = 0;
+        if (colorIndex > 255) colorIndex = 255;
+        var penColor = colors[colorIndex];
         if (len == 2) {
-          if (double.IsInfinity(penWidth) || double.IsNaN(penWidth)) penWidth = 1;
+          if (double.IsInfinity(penWidth) || double.IsNaN(penWidth))
+            penWidth = 1;
+
           pen = new Pen(penColor, (float)penWidth) { CustomEndCap = new AdjustableArrowCap(5, 3) };
           var start = points[0];
@@ -169 +173 @@
           var rect = target.Primitive as Rectangle;
           var ell = target.Primitive as Ellipse;
+
+          // calculate intersection point
           PointD intersectionPoint;
           if (rect != null)
@@ -176 +182 @@
           else
             throw new InvalidOperationException("Unknown vertex shape.");
+
           if (intersectionPoint == default(PointD))
             intersectionPoint = end;
+
           line = new Line(Chart, new PointD(start.X, start.Y), intersectionPoint, pen) { ToolTipText = arc.Label };
           Chart.Group.Add(line);
@@ -184 +192 @@
         } else {
           for (int i = 0; i < points.Length - 1; ++i) {
-            Line line;
             var start = points[i];
             var end = points[i + 1];
@@ -208 +215 @@
               pen = new Pen(penColor, (float)penWidth);
             }
-            line = new Line(Chart, new PointD(start.X, start.Y), endPoint, pen) { ToolTipText = arc.Label };
+            var startPoint = new PointD(start.X, start.Y);
+            var line = new Line(Chart, startPoint, endPoint, pen) { ToolTipText = arc.Label };
             Chart.Group.Add(line);
             if (intersectionPoints.Any()) {
@@ -248 +256 @@
       var rectangle = p as Rectangle;
       var ellipse = p as Ellipse;
-      var brush = (SolidBrush)shape.Brush;
+      var pen = new Pen(shape.Pen.Color);
+      var brush = new SolidBrush(((SolidBrush)shape.Brush).Color);
 
       if (rectangle != null) {
-        var r = new Rectangle(this.Chart, shape.LowerLeft, shape.UpperRight, new Pen(shape.Pen.Color), new SolidBrush(brush.Color));
+        var r = new Rectangle(this.Chart, shape.LowerLeft, shape.UpperRight, pen, brush);
         return new LabeledPrimitive(r, v.Label, shape.Font);
       }
       if (ellipse != null) {
-        var e = new Ellipse(this.Chart, shape.LowerLeft, shape.UpperRight, new Pen(shape.Pen.Color), new SolidBrush(brush.Color));
+        var e = new Ellipse(this.Chart, shape.LowerLeft, shape.UpperRight, pen, brush);
         return new LabeledPrimitive(e, v.Label, shape.Font);
       }

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

@@ -171 +171 @@
     <None Include="Plugin.cs.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RunCollectionVariableInteractionNetworkView.resx">
+      <DependentUpon>RunCollectionVariableInteractionNetworkView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/Layout/ConstrainedForceDirectedLayout.cs

@@ -25 +25 @@
 using System.Linq;
 using Cola;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Random;
@@ -180 +179 @@
 
     private static IEnumerable<Cluster> IdentifyClusters(RectanglePtrs rectangles, ColaEdges edges) {
-      var vertices = rectangles.Select(x => new Vertex()).ToList();
+      // build a graph using the rectangles and the edges
+      var vertices = new List<IVertex>(rectangles.Select(x => new Vertex()));
       foreach (var e in edges) {
         var i = (int)e.first;
@@ -188 +188 @@
         vertices[j].AddArc(arc);
       }
-      while (vertices.Min(x => x.Weight).IsAlmost(0)) {
-        foreach (var v in vertices) {
-          if (v.Weight > 0) continue;
-          v.Weight = vertices.Max(x => x.Weight) + 1;
+      // group vertices into clusters
+      var clusters = new List<RectangularCluster>();
+      for (int i = 0; i < vertices.Count; ++i) {
+        var v = vertices[i];
+        if (v.Weight > 0) {
+          clusters[(int)Math.Round(v.Weight) - 1].addChildNode((uint)i);
+        } else {
+          var cluster = new RectangularCluster();
+          cluster.addChildNode((uint)i);
+          clusters.Add(cluster);
+          v.Weight = clusters.Count;
           ColourNeighbours(v);
         }
       }
-      var colors = vertices.Select(x => (int)Math.Round(x.Weight)).ToList();
-      foreach (var i in colors.Distinct()) {
-        var cluster = new RectangularCluster();
-        for (int j = 0; j < colors.Count; ++j) {
-          if (colors[j] == i) cluster.addChildNode((uint)j);
-        }
-        yield return cluster;
-      }
+      return clusters;
     }
 

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

@@ -26 +26 @@
       this.components = new System.ComponentModel.Container();
       this.settingsGroupBox = new System.Windows.Forms.GroupBox();
+      this.impactThresholdTrackBar = new System.Windows.Forms.TrackBar();
+      this.exportImpactsMatrixButton = new System.Windows.Forms.Button();
       this.onlineImpactCalculationButton = new System.Windows.Forms.Button();
       this.maximizationCheckBox = new System.Windows.Forms.CheckBox();
       this.qualityResultNameComboBox = new System.Windows.Forms.ComboBox();
       this.qualityResultNameLabel = new System.Windows.Forms.Label();
-      this.impactThresholdTextBox = new System.Windows.Forms.TextBox();
       this.impactAggregationComboBox = new System.Windows.Forms.ComboBox();
       this.impactResultNameComboBox = new System.Windows.Forms.ComboBox();
@@ -42 +43 @@
       this.label3 = new System.Windows.Forms.Label();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+      this.impactThresholdLabel = new System.Windows.Forms.Label();
+      this.relayoutGraphButton = new System.Windows.Forms.Button();
       this.graphChart = new HeuristicLab.VariableInteractionNetworks.Views.DirectedGraphChart();
       this.settingsGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.impactThresholdTrackBar)).BeginInit();
       this.layoutOptionsGroupBox.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -52 +56 @@
       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.impactThresholdLabel);
+      this.settingsGroupBox.Controls.Add(this.impactThresholdTrackBar);
+      this.settingsGroupBox.Controls.Add(this.exportImpactsMatrixButton);
       this.settingsGroupBox.Controls.Add(this.onlineImpactCalculationButton);
       this.settingsGroupBox.Controls.Add(this.maximizationCheckBox);
       this.settingsGroupBox.Controls.Add(this.qualityResultNameComboBox);
       this.settingsGroupBox.Controls.Add(this.qualityResultNameLabel);
-      this.settingsGroupBox.Controls.Add(this.impactThresholdTextBox);
       this.settingsGroupBox.Controls.Add(this.impactAggregationComboBox);
       this.settingsGroupBox.Controls.Add(this.impactResultNameComboBox);
@@ -64 +70 @@
       this.settingsGroupBox.Location = new System.Drawing.Point(4, 4);
       this.settingsGroupBox.Name = "settingsGroupBox";
-      this.settingsGroupBox.Size = new System.Drawing.Size(331, 230);
+      this.settingsGroupBox.Size = new System.Drawing.Size(331, 235);
       this.settingsGroupBox.TabIndex = 1;
       this.settingsGroupBox.TabStop = false;
       this.settingsGroupBox.Text = "Network Configuration";
       // 
+      // impactThresholdTrackBar
+      // 
+      this.impactThresholdTrackBar.AutoSize = false;
+      this.impactThresholdTrackBar.LargeChange = 1;
+      this.impactThresholdTrackBar.Location = new System.Drawing.Point(10, 118);
+      this.impactThresholdTrackBar.Maximum = 1000;
+      this.impactThresholdTrackBar.Name = "impactThresholdTrackBar";
+      this.impactThresholdTrackBar.Size = new System.Drawing.Size(312, 23);
+      this.impactThresholdTrackBar.TabIndex = 7;
+      this.impactThresholdTrackBar.ValueChanged += new System.EventHandler(this.impactThresholdTrackBar_ValueChanged);
+      // 
+      // exportImpactsMatrixButton
+      // 
+      this.exportImpactsMatrixButton.Location = new System.Drawing.Point(10, 203);
+      this.exportImpactsMatrixButton.Name = "exportImpactsMatrixButton";
+      this.exportImpactsMatrixButton.Size = new System.Drawing.Size(149, 23);
+      this.exportImpactsMatrixButton.TabIndex = 6;
+      this.exportImpactsMatrixButton.Text = "Export Impacts Matrix";
+      this.exportImpactsMatrixButton.UseVisualStyleBackColor = true;
+      this.exportImpactsMatrixButton.Click += new System.EventHandler(this.exportImpactsMatrixButton_Click);
+      // 
       // onlineImpactCalculationButton
       // 
-      this.onlineImpactCalculationButton.Location = new System.Drawing.Point(10, 201);
+      this.onlineImpactCalculationButton.Location = new System.Drawing.Point(10, 174);
       this.onlineImpactCalculationButton.Name = "onlineImpactCalculationButton";
       this.onlineImpactCalculationButton.Size = new System.Drawing.Size(149, 23);
@@ -108 +135 @@
       this.qualityResultNameLabel.Text = "Quality result name";
       // 
-      // impactThresholdTextBox
-      // 
-      this.impactThresholdTextBox.Location = new System.Drawing.Point(121, 94);
-      this.impactThresholdTextBox.Name = "impactThresholdTextBox";
-      this.impactThresholdTextBox.Size = new System.Drawing.Size(201, 20);
-      this.impactThresholdTextBox.TabIndex = 2;
-      this.impactThresholdTextBox.Text = "0.2";
-      this.impactThresholdTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.TextBoxValidating);
-      this.impactThresholdTextBox.Validated += new System.EventHandler(this.ImpactThresholdTextBoxValidated);
-      // 
       // impactAggregationComboBox
       // 
@@ -124 +141 @@
             "Best run",
             "Runs average"});
-      this.impactAggregationComboBox.Location = new System.Drawing.Point(121, 120);
+      this.impactAggregationComboBox.Location = new System.Drawing.Point(121, 147);
       this.impactAggregationComboBox.Name = "impactAggregationComboBox";
       this.impactAggregationComboBox.Size = new System.Drawing.Size(201, 21);
@@ -143 +160 @@
       // 
       this.weightAggregationLabel.AutoSize = true;
-      this.weightAggregationLabel.Location = new System.Drawing.Point(7, 123);
+      this.weightAggregationLabel.Location = new System.Drawing.Point(7, 150);
       this.weightAggregationLabel.Name = "weightAggregationLabel";
       this.weightAggregationLabel.Size = new System.Drawing.Size(98, 13);
@@ -171 +188 @@
       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.relayoutGraphButton);
       this.layoutOptionsGroupBox.Controls.Add(this.idealEdgeLengthTextBox);
       this.layoutOptionsGroupBox.Controls.Add(this.edgeRoutingComboBox);
       this.layoutOptionsGroupBox.Controls.Add(this.label4);
       this.layoutOptionsGroupBox.Controls.Add(this.label3);
-      this.layoutOptionsGroupBox.Location = new System.Drawing.Point(4, 240);
+      this.layoutOptionsGroupBox.Location = new System.Drawing.Point(4, 245);
       this.layoutOptionsGroupBox.Name = "layoutOptionsGroupBox";
-      this.layoutOptionsGroupBox.Size = new System.Drawing.Size(331, 222);
+      this.layoutOptionsGroupBox.Size = new System.Drawing.Size(331, 217);
       this.layoutOptionsGroupBox.TabIndex = 2;
       this.layoutOptionsGroupBox.TabStop = false;
@@ -227 +245 @@
       // 
       this.errorProvider.ContainerControl = this;
+      // 
+      // impactThresholdLabel
+      // 
+      this.impactThresholdLabel.Location = new System.Drawing.Point(118, 92);
+      this.impactThresholdLabel.Name = "impactThresholdLabel";
+      this.impactThresholdLabel.Size = new System.Drawing.Size(204, 23);
+      this.impactThresholdLabel.TabIndex = 8;
+      this.impactThresholdLabel.Text = "0";
+      this.impactThresholdLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+      // 
+      // relayoutGraphButton
+      // 
+      this.relayoutGraphButton.Location = new System.Drawing.Point(10, 69);
+      this.relayoutGraphButton.Name = "relayoutGraphButton";
+      this.relayoutGraphButton.Size = new System.Drawing.Size(149, 23);
+      this.relayoutGraphButton.TabIndex = 4;
+      this.relayoutGraphButton.Text = "Recalculate Layout";
+      this.relayoutGraphButton.UseVisualStyleBackColor = true;
+      this.relayoutGraphButton.Click += new System.EventHandler(this.relayoutGraphButton_Click);
       // 
       // graphChart
@@ -256 +293 @@
       this.settingsGroupBox.ResumeLayout(false);
       this.settingsGroupBox.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.impactThresholdTrackBar)).EndInit();
       this.layoutOptionsGroupBox.ResumeLayout(false);
       this.layoutOptionsGroupBox.PerformLayout();
@@ -270 +308 @@
     private System.Windows.Forms.Label label2;
     private System.Windows.Forms.ComboBox impactResultNameComboBox;
-    private System.Windows.Forms.TextBox impactThresholdTextBox;
     private System.Windows.Forms.GroupBox layoutOptionsGroupBox;
     private System.Windows.Forms.Label label3;
@@ -283 +320 @@
     private System.Windows.Forms.CheckBox maximizationCheckBox;
     private System.Windows.Forms.Button onlineImpactCalculationButton;
+    private System.Windows.Forms.Button exportImpactsMatrixButton;
+    private System.Windows.Forms.TrackBar impactThresholdTrackBar;
+    private System.Windows.Forms.Label impactThresholdLabel;
+    private System.Windows.Forms.Button relayoutGraphButton;
   }
 }

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

@@ -322 +322 @@
       foreach (var run in runs) {
         var impactsMatrix = (DoubleMatrix)run.Results[resultName];
-
         int i = 0;
         foreach (var v in impactsMatrix.RowNames) {
@@ -412 +411 @@
     private void NetworkConfigurationChanged(object sender, EventArgs e) {
       var useBest = impactAggregationComboBox.SelectedIndex <= 0;
-      var threshold = double.Parse(impactThresholdTextBox.Text);
+      var threshold = impactThresholdTrackBar.Value / 100.0;
       var qualityResultName = qualityResultNameComboBox.Text;
       var impactsResultName = impactResultNameComboBox.Text;
@@ -451 +450 @@
         = impactResultNameComboBox.Enabled
         = impactAggregationComboBox.Enabled
-        = impactThresholdTextBox.Enabled
+        = impactThresholdTrackBar.Enabled
         = onlineImpactCalculationButton.Enabled
         = edgeRoutingComboBox.Enabled
-        = idealEdgeLengthTextBox.Enabled = enabled;
+        = idealEdgeLengthTextBox.Enabled
+        = maximizationCheckBox.Enabled = enabled;
     }
 
@@ -463 +463 @@
         var impacts = CalculateVariableImpactsOnline(Content, false);
         variableInteractionNetwork = CreateNetwork(impacts);
-        var threshold = double.Parse(impactThresholdTextBox.Text);
+        var threshold = impactThresholdTrackBar.Minimum + (double)impactThresholdTrackBar.Value / impactThresholdTrackBar.Maximum;
         graphChart.Graph = ApplyThreshold(variableInteractionNetwork, threshold);
       };
@@ -469 +469 @@
       worker.RunWorkerAsync();
     }
+
+    private void relayoutGraphButton_Click(object sender, EventArgs e) {
+      graphChart.Draw();
+    }
     #endregion
+
+    private void exportImpactsMatrixButton_Click(object sender, EventArgs e) {
+      var graph = graphChart.Graph;
+      var labels = graph.Vertices.OfType<VariableNetworkNode>().Select(x => x.Label).ToList();
+      labels.Sort(); // sort variables alphabetically
+      var matrix = new DoubleMatrix(labels.Count, labels.Count) { RowNames = labels, ColumnNames = labels };
+      var indexes = labels.Select((x, i) => new { Label = x, Index = i }).ToDictionary(x => x.Label, x => x.Index);
+      var junctions = graph.Vertices.OfType<JunctionNetworkNode>().ToList();
+      foreach (var jn in junctions) {
+        var target = jn.OutArcs.First().Target.Label;
+        var targetIndex = indexes[target];
+        foreach (var input in jn.InArcs) {
+          var inputIndex = indexes[input.Source.Label];
+          var inputImpact = input.Weight;
+          matrix[targetIndex, inputIndex] = inputImpact;
+        }
+      }
+      for (int i = 0; i < labels.Count; ++i) matrix[i, i] = 1;
+      MainFormManager.MainForm.ShowContent(matrix);
+    }
+
+    private void impactThresholdTrackBar_ValueChanged(object sender, EventArgs e) {
+      var impact = impactThresholdTrackBar.Minimum + (double)impactThresholdTrackBar.Value / impactThresholdTrackBar.Maximum;
+      impactThresholdLabel.Text = impact.ToString("N3", CultureInfo.CurrentCulture);
+      var network = ApplyThreshold(variableInteractionNetwork, impact);
+      graphChart.Graph = network;
+    }
+
+
   }
 }