Changeset 7415 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3

Timestamp:

01/26/12 14:50:56 (12 years ago)

Author:

abeham

Message:

#1614: improved results output of GQAP

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3

Files:

• GQAPAssignmentView.Designer.cs (modified) (6 diffs)
• GQAPAssignmentView.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

@@ -47 +47 @@
       this.assignmentTreeView = new System.Windows.Forms.TreeView();
       this.label1 = new System.Windows.Forms.Label();
-      this.qualityTextBox = new System.Windows.Forms.TextBox();
-      this.label2 = new System.Windows.Forms.Label();
+      this.qualityLabel = new System.Windows.Forms.Label();
+      this.assignmentGroupBox = new System.Windows.Forms.GroupBox();
+      this.characteristicsGroupBox = new System.Windows.Forms.GroupBox();
+      this.flowDistanceQualityLabel = new System.Windows.Forms.Label();
+      this.label3 = new System.Windows.Forms.Label();
+      this.installationQualityLabel = new System.Windows.Forms.Label();
+      this.label5 = new System.Windows.Forms.Label();
+      this.overbookedCapacityLabel = new System.Windows.Forms.Label();
+      this.label7 = new System.Windows.Forms.Label();
+      this.assignmentGroupBox.SuspendLayout();
+      this.characteristicsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -56 +65 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.assignmentTreeView.Location = new System.Drawing.Point(3, 50);
+      this.assignmentTreeView.Location = new System.Drawing.Point(6, 19);
       this.assignmentTreeView.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);
       this.assignmentTreeView.Name = "assignmentTreeView";
-      this.assignmentTreeView.Size = new System.Drawing.Size(349, 331);
+      this.assignmentTreeView.Size = new System.Drawing.Size(228, 331);
       this.assignmentTreeView.TabIndex = 3;
       // 
@@ -65 +74 @@
       // 
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(3, 7);
+      this.label1.Location = new System.Drawing.Point(6, 19);
+      this.label1.Margin = new System.Windows.Forms.Padding(3);
       this.label1.Name = "label1";
       this.label1.Size = new System.Drawing.Size(42, 13);
@@ -71 +81 @@
       this.label1.Text = "Quality:";
       // 
-      // qualityTextBox
-      // 
-      this.qualityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      // qualityLabel
+      // 
+      this.qualityLabel.AutoSize = true;
+      this.qualityLabel.Location = new System.Drawing.Point(91, 19);
+      this.qualityLabel.Margin = new System.Windows.Forms.Padding(3);
+      this.qualityLabel.Name = "qualityLabel";
+      this.qualityLabel.Size = new System.Drawing.Size(10, 13);
+      this.qualityLabel.TabIndex = 4;
+      this.qualityLabel.Text = "-";
+      // 
+      // assignmentGroupBox
+      // 
+      this.assignmentGroupBox.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.qualityTextBox.Location = new System.Drawing.Point(51, 4);
-      this.qualityTextBox.Name = "qualityTextBox";
-      this.qualityTextBox.Size = new System.Drawing.Size(301, 20);
-      this.qualityTextBox.TabIndex = 1;
-      // 
-      // label2
-      // 
-      this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(3, 31);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(64, 13);
-      this.label2.TabIndex = 2;
-      this.label2.Text = "Assignment:";
+      this.assignmentGroupBox.Controls.Add(this.assignmentTreeView);
+      this.assignmentGroupBox.Location = new System.Drawing.Point(217, 3);
+      this.assignmentGroupBox.Name = "assignmentGroupBox";
+      this.assignmentGroupBox.Size = new System.Drawing.Size(240, 356);
+      this.assignmentGroupBox.TabIndex = 5;
+      this.assignmentGroupBox.TabStop = false;
+      this.assignmentGroupBox.Text = "Assignment";
+      // 
+      // characteristicsGroupBox
+      // 
+      this.characteristicsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)));
+      this.characteristicsGroupBox.Controls.Add(this.label7);
+      this.characteristicsGroupBox.Controls.Add(this.overbookedCapacityLabel);
+      this.characteristicsGroupBox.Controls.Add(this.label5);
+      this.characteristicsGroupBox.Controls.Add(this.installationQualityLabel);
+      this.characteristicsGroupBox.Controls.Add(this.label3);
+      this.characteristicsGroupBox.Controls.Add(this.flowDistanceQualityLabel);
+      this.characteristicsGroupBox.Controls.Add(this.label1);
+      this.characteristicsGroupBox.Controls.Add(this.qualityLabel);
+      this.characteristicsGroupBox.Location = new System.Drawing.Point(3, 3);
+      this.characteristicsGroupBox.Name = "characteristicsGroupBox";
+      this.characteristicsGroupBox.Size = new System.Drawing.Size(208, 356);
+      this.characteristicsGroupBox.TabIndex = 6;
+      this.characteristicsGroupBox.TabStop = false;
+      this.characteristicsGroupBox.Text = "Characteristics";
+      // 
+      // flowDistanceQualityLabel
+      // 
+      this.flowDistanceQualityLabel.AutoSize = true;
+      this.flowDistanceQualityLabel.Location = new System.Drawing.Point(91, 38);
+      this.flowDistanceQualityLabel.Margin = new System.Windows.Forms.Padding(3);
+      this.flowDistanceQualityLabel.Name = "flowDistanceQualityLabel";
+      this.flowDistanceQualityLabel.Size = new System.Drawing.Size(10, 13);
+      this.flowDistanceQualityLabel.TabIndex = 4;
+      this.flowDistanceQualityLabel.Text = "-";
+      // 
+      // label3
+      // 
+      this.label3.AutoSize = true;
+      this.label3.Location = new System.Drawing.Point(6, 38);
+      this.label3.Margin = new System.Windows.Forms.Padding(3);
+      this.label3.Name = "label3";
+      this.label3.Size = new System.Drawing.Size(79, 13);
+      this.label3.TabIndex = 0;
+      this.label3.Text = "Flow/Distance:";
+      // 
+      // installationQualityLabel
+      // 
+      this.installationQualityLabel.AutoSize = true;
+      this.installationQualityLabel.Location = new System.Drawing.Point(91, 57);
+      this.installationQualityLabel.Margin = new System.Windows.Forms.Padding(3);
+      this.installationQualityLabel.Name = "installationQualityLabel";
+      this.installationQualityLabel.Size = new System.Drawing.Size(10, 13);
+      this.installationQualityLabel.TabIndex = 4;
+      this.installationQualityLabel.Text = "-";
+      // 
+      // label5
+      // 
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(6, 57);
+      this.label5.Margin = new System.Windows.Forms.Padding(3);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(60, 13);
+      this.label5.TabIndex = 0;
+      this.label5.Text = "Installation:";
+      // 
+      // overbookedCapacityLabel
+      // 
+      this.overbookedCapacityLabel.AutoSize = true;
+      this.overbookedCapacityLabel.Location = new System.Drawing.Point(91, 76);
+      this.overbookedCapacityLabel.Margin = new System.Windows.Forms.Padding(3);
+      this.overbookedCapacityLabel.Name = "overbookedCapacityLabel";
+      this.overbookedCapacityLabel.Size = new System.Drawing.Size(10, 13);
+      this.overbookedCapacityLabel.TabIndex = 4;
+      this.overbookedCapacityLabel.Text = "-";
+      // 
+      // label7
+      // 
+      this.label7.AutoSize = true;
+      this.label7.Location = new System.Drawing.Point(6, 76);
+      this.label7.Margin = new System.Windows.Forms.Padding(3);
+      this.label7.Name = "label7";
+      this.label7.Size = new System.Drawing.Size(71, 13);
+      this.label7.TabIndex = 0;
+      this.label7.Text = "Overbooking:";
       // 
       // GQAPAssignmentView
@@ -93 +187 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.qualityTextBox);
-      this.Controls.Add(this.label2);
-      this.Controls.Add(this.label1);
-      this.Controls.Add(this.assignmentTreeView);
+      this.Controls.Add(this.characteristicsGroupBox);
+      this.Controls.Add(this.assignmentGroupBox);
       this.Name = "GQAPAssignmentView";
-      this.Size = new System.Drawing.Size(355, 384);
+      this.Size = new System.Drawing.Size(460, 362);
+      this.assignmentGroupBox.ResumeLayout(false);
+      this.characteristicsGroupBox.ResumeLayout(false);
+      this.characteristicsGroupBox.PerformLayout();
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -108 +202 @@
     private System.Windows.Forms.TreeView assignmentTreeView;
     private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.TextBox qualityTextBox;
-    private System.Windows.Forms.Label label2;
+    private System.Windows.Forms.Label qualityLabel;
+    private System.Windows.Forms.GroupBox assignmentGroupBox;
+    private System.Windows.Forms.GroupBox characteristicsGroupBox;
+    private System.Windows.Forms.Label label3;
+    private System.Windows.Forms.Label flowDistanceQualityLabel;
+    private System.Windows.Forms.Label label7;
+    private System.Windows.Forms.Label overbookedCapacityLabel;
+    private System.Windows.Forms.Label label5;
+    private System.Windows.Forms.Label installationQualityLabel;
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
@@ -44 +45 @@
     #region Register Content Events
     protected override void DeregisterContentEvents() {
-      // TODO: Deregister your event handlers on the Content here
+      Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      // TODO: Register your event handlers on the Content here
+      Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
     }
     #endregion
@@ -55 +56 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      assignmentTreeView.Nodes.Clear();
-      if (Content == null) {
-        qualityTextBox.Text = String.Empty;
-      } else {
-        qualityTextBox.Text = Content.Quality.Value.ToString();
-        BuildAssignmentTree();
-      }
+      UpdateQuality();
+      UpdateAssignment();
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      qualityTextBox.Enabled = false;
-      assignmentTreeView.Enabled = true;
     }
 
     #region Event Handlers
-    // TODO: Put event handlers here
+    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      switch (e.PropertyName) {
+        case "Quality": UpdateQuality(); break;
+        case "FlowDistanceQuality": UpdateFlowDistanceQuality(); break;
+        case "InstallationQuality": UpdateInstallationQuality(); break;
+        case "OverbookedCapacity": UpdateOverbookedCapacity(); break;
+        case "Assignment": UpdateAssignment(); break;
+        case "EquipmentNames": UpdateAssignment(); break;
+        case "LocationNames": UpdateAssignment(); break;
+        default: break;
+      }
+    }
     #endregion
 
-    private void BuildAssignmentTree() {
-      IntegerVector assignment = Content.Assignment;
-      Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>();
-      for (int i = 0; i < assignment.Length; i++) {
-        if (!locationNodes.ContainsKey(assignment[i])) {
-          string locationName = assignment[i].ToString();
-          if (Content.LocationNames != null && Content.LocationNames.Length > 0)
-            locationName = Content.LocationNames[assignment[i] % Content.LocationNames.Length];
-          locationNodes.Add(assignment[i], new TreeNode(locationName));
+    private void UpdateQuality() {
+      if (InvokeRequired) Invoke((Action)UpdateQuality);
+      else {
+        if (Content == null) {
+          qualityLabel.Text = "-";
+        } else {
+          qualityLabel.Text = Content.Quality.ToString();
         }
-        string equipmentName = i.ToString();
-        if (Content.EquipmentNames != null && Content.EquipmentNames.Length > 0)
-          equipmentName = Content.EquipmentNames[i % Content.EquipmentNames.Length];
-        locationNodes[assignment[i]].Nodes.Add(equipmentName);
       }
+    }
 
-      assignmentTreeView.BeginUpdate();
-      try {
-        foreach (var node in locationNodes.OrderBy(x => x.Key).Select(x => x.Value)) {
-          assignmentTreeView.Nodes.Add(node);
-          node.Expand();
+    private void UpdateFlowDistanceQuality() {
+      if (InvokeRequired) Invoke((Action)UpdateFlowDistanceQuality);
+      else {
+        if (Content == null || Content.FlowDistanceQuality == null) {
+          flowDistanceQualityLabel.Text = "-";
+        } else {
+          flowDistanceQualityLabel.Text = Content.FlowDistanceQuality.ToString();
         }
-      } finally { assignmentTreeView.EndUpdate(); }
+      }
+    }
+
+    private void UpdateInstallationQuality() {
+      if (InvokeRequired) Invoke((Action)UpdateInstallationQuality);
+      else {
+        if (Content == null || Content.InstallationQuality == null) {
+          installationQualityLabel.Text = "-";
+        } else {
+          installationQualityLabel.Text = Content.InstallationQuality.ToString();
+        }
+      }
+    }
+
+    private void UpdateOverbookedCapacity() {
+      if (InvokeRequired) Invoke((Action)UpdateOverbookedCapacity);
+      else {
+        if (Content == null || Content.OverbookedCapacity == null) {
+          overbookedCapacityLabel.Text = "-";
+        } else {
+          overbookedCapacityLabel.Text = Content.OverbookedCapacity.ToString();
+        }
+      }
+    }
+
+    private void UpdateAssignment() {
+      if (InvokeRequired) Invoke((Action)UpdateAssignment);
+      else {
+        assignmentTreeView.Nodes.Clear();
+        if (Content != null) {
+          IntegerVector assignment = Content.Assignment;
+          Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>();
+          for (int i = 0; i < assignment.Length; i++) {
+            if (!locationNodes.ContainsKey(assignment[i])) {
+              string locationName = assignment[i].ToString();
+              if (Content.LocationNames != null && Content.LocationNames.Length > assignment[i])
+                locationName = Content.LocationNames[assignment[i]];
+              locationNodes.Add(assignment[i], new TreeNode(locationName));
+            }
+            string equipmentName = i.ToString();
+            if (Content.EquipmentNames != null && Content.EquipmentNames.Length > i)
+              equipmentName = Content.EquipmentNames[i];
+            locationNodes[assignment[i]].Nodes.Add(equipmentName);
+          }
+
+          assignmentTreeView.BeginUpdate();
+          try {
+            foreach (var node in locationNodes.OrderBy(x => x.Key).Select(x => x.Value)) {
+              assignmentTreeView.Nodes.Add(node);
+              node.Expand();
+            }
+          } finally { assignmentTreeView.EndUpdate(); }
+        }
+      }
     }
   }