Changeset 5648 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs

Timestamp:

03/10/11 01:49:10 (14 years ago)

Author:

abeham

Message:

#1330

• Unified QAP visualization in solution and problem view
• Fixed bug in gradient-descent gradient calculation when performing multidimensional scaling
• Extended QAPLIB parsers to cover some file format variations
• Added unit tests to check if all QAPLIB instances import without error
• Changed BestKnownSolution to be an OptionalValueParameter

Location:

branches/QAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs (modified) (7 diffs)

branches/QAP

@@ -1 +1 @@
 *.suo
+TestResults

@@ -1 +1 @@
 *.suo
+TestResults

branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs

@@ -50 +50 @@
       this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.visualizationTabPage = new System.Windows.Forms.TabPage();
-      this.distancesRadioButton = new System.Windows.Forms.RadioButton();
-      this.weightsRadioButton = new System.Windows.Forms.RadioButton();
-      this.pictureBox = new System.Windows.Forms.PictureBox();
       this.valueTabPage = new System.Windows.Forms.TabPage();
       this.assignmentGroupBox = new System.Windows.Forms.GroupBox();
       this.assignmentViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.redrawButton = new System.Windows.Forms.Button();
+      this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPView();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -64 +61 @@
       this.tabControl.SuspendLayout();
       this.visualizationTabPage.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
       this.valueTabPage.SuspendLayout();
       this.assignmentGroupBox.SuspendLayout();
@@ -132 +128 @@
       // visualizationTabPage
       // 
-      this.visualizationTabPage.Controls.Add(this.redrawButton);
-      this.visualizationTabPage.Controls.Add(this.distancesRadioButton);
-      this.visualizationTabPage.Controls.Add(this.weightsRadioButton);
-      this.visualizationTabPage.Controls.Add(this.pictureBox);
+      this.visualizationTabPage.Controls.Add(this.qapView);
       this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
       this.visualizationTabPage.Name = "visualizationTabPage";
@@ -143 +136 @@
       this.visualizationTabPage.Text = "Visualization";
       this.visualizationTabPage.UseVisualStyleBackColor = true;
-      // 
-      // distancesRadioButton
-      // 
-      this.distancesRadioButton.AutoSize = true;
-      this.distancesRadioButton.Checked = true;
-      this.distancesRadioButton.Location = new System.Drawing.Point(6, 6);
-      this.distancesRadioButton.Name = "distancesRadioButton";
-      this.distancesRadioButton.Size = new System.Drawing.Size(72, 17);
-      this.distancesRadioButton.TabIndex = 2;
-      this.distancesRadioButton.TabStop = true;
-      this.distancesRadioButton.Text = "Distances";
-      this.distancesRadioButton.UseVisualStyleBackColor = true;
-      this.distancesRadioButton.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
-      // 
-      // weightsRadioButton
-      // 
-      this.weightsRadioButton.AutoSize = true;
-      this.weightsRadioButton.Location = new System.Drawing.Point(6, 29);
-      this.weightsRadioButton.Name = "weightsRadioButton";
-      this.weightsRadioButton.Size = new System.Drawing.Size(64, 17);
-      this.weightsRadioButton.TabIndex = 1;
-      this.weightsRadioButton.Text = "Weights";
-      this.weightsRadioButton.UseVisualStyleBackColor = true;
-      this.weightsRadioButton.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
-      // 
-      // pictureBox
-      // 
-      this.pictureBox.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.pictureBox.BackColor = System.Drawing.Color.White;
-      this.pictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.pictureBox.Location = new System.Drawing.Point(84, 6);
-      this.pictureBox.Name = "pictureBox";
-      this.pictureBox.Size = new System.Drawing.Size(438, 269);
-      this.pictureBox.TabIndex = 0;
-      this.pictureBox.TabStop = false;
-      this.pictureBox.SizeChanged += new System.EventHandler(this.pictureBox_SizeChanged);
       // 
       // valueTabPage
@@ -222 +177 @@
       this.assignmentViewHost.ViewType = null;
       // 
-      // redrawButton
-      // 
-      this.redrawButton.Location = new System.Drawing.Point(4, 53);
-      this.redrawButton.Name = "redrawButton";
-      this.redrawButton.Size = new System.Drawing.Size(74, 23);
-      this.redrawButton.TabIndex = 3;
-      this.redrawButton.Text = "Redraw";
-      this.redrawButton.UseVisualStyleBackColor = true;
-      this.redrawButton.Click += new System.EventHandler(this.redrawButton_Click);
+      // qapView
+      // 
+      this.qapView.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.qapView.Assignment = null;
+      this.qapView.Distances = null;
+      this.qapView.Location = new System.Drawing.Point(0, 3);
+      this.qapView.Name = "qapView";
+      this.qapView.Size = new System.Drawing.Size(526, 278);
+      this.qapView.TabIndex = 0;
+      this.qapView.Weights = null;
       // 
       // QAPAssignmentView
@@ -246 +204 @@
       this.tabControl.ResumeLayout(false);
       this.visualizationTabPage.ResumeLayout(false);
-      this.visualizationTabPage.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
       this.valueTabPage.ResumeLayout(false);
       this.assignmentGroupBox.ResumeLayout(false);
@@ -261 +217 @@
     private MainForm.WindowsForms.DragOverTabControl tabControl;
     private System.Windows.Forms.TabPage visualizationTabPage;
-    private System.Windows.Forms.PictureBox pictureBox;
     private System.Windows.Forms.TabPage valueTabPage;
     private System.Windows.Forms.GroupBox assignmentGroupBox;
     private MainForm.WindowsForms.ViewHost assignmentViewHost;
-    private System.Windows.Forms.RadioButton distancesRadioButton;
-    private System.Windows.Forms.RadioButton weightsRadioButton;
-    private System.Windows.Forms.Button redrawButton;
+    private QAPView qapView;
   }
 }

@@ -1 +1 @@
 *.suo
+TestResults