Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/10/11 01:49:10 (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/QAP

    • Property svn:ignore
      •  

        old new  
        11*.suo
         2TestResults
  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs

    r5641 r5648  
    5050      this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
    5151      this.visualizationTabPage = new System.Windows.Forms.TabPage();
    52       this.distancesRadioButton = new System.Windows.Forms.RadioButton();
    53       this.weightsRadioButton = new System.Windows.Forms.RadioButton();
    54       this.pictureBox = new System.Windows.Forms.PictureBox();
    5552      this.valueTabPage = new System.Windows.Forms.TabPage();
    5653      this.assignmentGroupBox = new System.Windows.Forms.GroupBox();
    5754      this.assignmentViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    58       this.redrawButton = new System.Windows.Forms.Button();
     55      this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPView();
    5956      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    6057      this.splitContainer.Panel1.SuspendLayout();
     
    6461      this.tabControl.SuspendLayout();
    6562      this.visualizationTabPage.SuspendLayout();
    66       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
    6763      this.valueTabPage.SuspendLayout();
    6864      this.assignmentGroupBox.SuspendLayout();
     
    132128      // visualizationTabPage
    133129      //
    134       this.visualizationTabPage.Controls.Add(this.redrawButton);
    135       this.visualizationTabPage.Controls.Add(this.distancesRadioButton);
    136       this.visualizationTabPage.Controls.Add(this.weightsRadioButton);
    137       this.visualizationTabPage.Controls.Add(this.pictureBox);
     130      this.visualizationTabPage.Controls.Add(this.qapView);
    138131      this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
    139132      this.visualizationTabPage.Name = "visualizationTabPage";
     
    143136      this.visualizationTabPage.Text = "Visualization";
    144137      this.visualizationTabPage.UseVisualStyleBackColor = true;
    145       //
    146       // distancesRadioButton
    147       //
    148       this.distancesRadioButton.AutoSize = true;
    149       this.distancesRadioButton.Checked = true;
    150       this.distancesRadioButton.Location = new System.Drawing.Point(6, 6);
    151       this.distancesRadioButton.Name = "distancesRadioButton";
    152       this.distancesRadioButton.Size = new System.Drawing.Size(72, 17);
    153       this.distancesRadioButton.TabIndex = 2;
    154       this.distancesRadioButton.TabStop = true;
    155       this.distancesRadioButton.Text = "Distances";
    156       this.distancesRadioButton.UseVisualStyleBackColor = true;
    157       this.distancesRadioButton.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
    158       //
    159       // weightsRadioButton
    160       //
    161       this.weightsRadioButton.AutoSize = true;
    162       this.weightsRadioButton.Location = new System.Drawing.Point(6, 29);
    163       this.weightsRadioButton.Name = "weightsRadioButton";
    164       this.weightsRadioButton.Size = new System.Drawing.Size(64, 17);
    165       this.weightsRadioButton.TabIndex = 1;
    166       this.weightsRadioButton.Text = "Weights";
    167       this.weightsRadioButton.UseVisualStyleBackColor = true;
    168       this.weightsRadioButton.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
    169       //
    170       // pictureBox
    171       //
    172       this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    173                   | System.Windows.Forms.AnchorStyles.Left)
    174                   | System.Windows.Forms.AnchorStyles.Right)));
    175       this.pictureBox.BackColor = System.Drawing.Color.White;
    176       this.pictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
    177       this.pictureBox.Location = new System.Drawing.Point(84, 6);
    178       this.pictureBox.Name = "pictureBox";
    179       this.pictureBox.Size = new System.Drawing.Size(438, 269);
    180       this.pictureBox.TabIndex = 0;
    181       this.pictureBox.TabStop = false;
    182       this.pictureBox.SizeChanged += new System.EventHandler(this.pictureBox_SizeChanged);
    183138      //
    184139      // valueTabPage
     
    222177      this.assignmentViewHost.ViewType = null;
    223178      //
    224       // redrawButton
    225       //
    226       this.redrawButton.Location = new System.Drawing.Point(4, 53);
    227       this.redrawButton.Name = "redrawButton";
    228       this.redrawButton.Size = new System.Drawing.Size(74, 23);
    229       this.redrawButton.TabIndex = 3;
    230       this.redrawButton.Text = "Redraw";
    231       this.redrawButton.UseVisualStyleBackColor = true;
    232       this.redrawButton.Click += new System.EventHandler(this.redrawButton_Click);
     179      // qapView
     180      //
     181      this.qapView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     182                  | System.Windows.Forms.AnchorStyles.Left)
     183                  | System.Windows.Forms.AnchorStyles.Right)));
     184      this.qapView.Assignment = null;
     185      this.qapView.Distances = null;
     186      this.qapView.Location = new System.Drawing.Point(0, 3);
     187      this.qapView.Name = "qapView";
     188      this.qapView.Size = new System.Drawing.Size(526, 278);
     189      this.qapView.TabIndex = 0;
     190      this.qapView.Weights = null;
    233191      //
    234192      // QAPAssignmentView
     
    246204      this.tabControl.ResumeLayout(false);
    247205      this.visualizationTabPage.ResumeLayout(false);
    248       this.visualizationTabPage.PerformLayout();
    249       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
    250206      this.valueTabPage.ResumeLayout(false);
    251207      this.assignmentGroupBox.ResumeLayout(false);
     
    261217    private MainForm.WindowsForms.DragOverTabControl tabControl;
    262218    private System.Windows.Forms.TabPage visualizationTabPage;
    263     private System.Windows.Forms.PictureBox pictureBox;
    264219    private System.Windows.Forms.TabPage valueTabPage;
    265220    private System.Windows.Forms.GroupBox assignmentGroupBox;
    266221    private MainForm.WindowsForms.ViewHost assignmentViewHost;
    267     private System.Windows.Forms.RadioButton distancesRadioButton;
    268     private System.Windows.Forms.RadioButton weightsRadioButton;
    269     private System.Windows.Forms.Button redrawButton;
     222    private QAPView qapView;
    270223  }
    271224}
Note: See TracChangeset for help on using the changeset viewer.