Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/08/12 13:31:18 (11 years ago)
Author:
abeham
Message:

#1329:

  • Added JSSPData class to problem instances
  • Added problem instance provider for some ORLIB JSSP instances (abz, ft, la01-20)
  • Adapted JSSP to load and export jssp problems
  • Adapted JSSP problem view to derive from ProblemView
  • Added static methods to MakespanEvaluator and MeanTardinessEvaluator
  • Fixed a bug in PRVUniformOnePositionManipulator
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.Designer.cs

    r6406 r8882  
    2525    /// </summary>
    2626    private void InitializeComponent() {
    27       this.importButton = new System.Windows.Forms.Button();
    28       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
    29       this.tabControl1 = new System.Windows.Forms.TabControl();
    30       this.tabPage1 = new System.Windows.Forms.TabPage();
    31       this.tabPage2 = new System.Windows.Forms.TabPage();
    32       this.ganttChart = new GanttChart();
     27      this.problemTabControl = new System.Windows.Forms.TabControl();
     28      this.problemTabPage = new System.Windows.Forms.TabPage();
     29      this.visualizationTabPage = new System.Windows.Forms.TabPage();
     30      this.ganttChart = new HeuristicLab.Encodings.ScheduleEncoding.Views.GanttChart();
     31      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
     32      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
     33      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
     34      this.problemInstanceSplitContainer.SuspendLayout();
    3335      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    34       this.tabControl1.SuspendLayout();
    35       this.tabPage1.SuspendLayout();
    36       this.tabPage2.SuspendLayout();
     36      this.problemTabControl.SuspendLayout();
     37      this.problemTabPage.SuspendLayout();
     38      this.visualizationTabPage.SuspendLayout();
    3739      this.SuspendLayout();
     40      //
     41      // problemInstanceSplitContainer
     42      //
     43      this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     44      this.problemInstanceSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
     45      //
     46      // problemInstanceSplitContainer.Panel2
     47      //
     48      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.problemTabControl);
     49      //
     50      // ProblemInstanceConsumerViewHost
     51      //
     52      this.ProblemInstanceConsumerViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     53      this.ProblemInstanceConsumerViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
     54      this.ProblemInstanceConsumerViewHost.Location = new System.Drawing.Point(0, 0);
     55      this.ProblemInstanceConsumerViewHost.Size = new System.Drawing.Size(511, 26);
     56      //
     57      // parameterCollectionView
     58      //
     59      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     60      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
     61      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
     62      this.parameterCollectionView.Size = new System.Drawing.Size(491, 271);
    3863      //
    3964      // nameTextBox
     
    4166      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    4267      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    43       this.nameTextBox.Size = new System.Drawing.Size(650, 20);
     68      this.nameTextBox.Size = new System.Drawing.Size(439, 20);
    4469      //
    4570      // infoLabel
    4671      //
    47       this.infoLabel.Location = new System.Drawing.Point(714, 3);
     72      this.infoLabel.Location = new System.Drawing.Point(492, 3);
    4873      //
    49       // importButton
     74      // problemTabControl
    5075      //
    51       this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    52                   | System.Windows.Forms.AnchorStyles.Right)));
    53       this.importButton.Location = new System.Drawing.Point(6, 26);
    54       this.importButton.Name = "importButton";
    55       this.importButton.Size = new System.Drawing.Size(724, 23);
    56       this.importButton.TabIndex = 3;
    57       this.importButton.Text = "Import";
    58       this.importButton.UseVisualStyleBackColor = true;
    59       this.importButton.Click += new System.EventHandler(this.importButton_Click);
     76      this.problemTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     77            | System.Windows.Forms.AnchorStyles.Left)
     78            | System.Windows.Forms.AnchorStyles.Right)));
     79      this.problemTabControl.Controls.Add(this.problemTabPage);
     80      this.problemTabControl.Controls.Add(this.visualizationTabPage);
     81      this.problemTabControl.Location = new System.Drawing.Point(3, 27);
     82      this.problemTabControl.Name = "problemTabControl";
     83      this.problemTabControl.SelectedIndex = 0;
     84      this.problemTabControl.Size = new System.Drawing.Size(505, 303);
     85      this.problemTabControl.TabIndex = 5;
    6086      //
    61       // parameterCollectionView
     87      // problemTabPage
    6288      //
    63       this.parameterCollectionView.AllowEditingOfHiddenParameters = true;
    64       this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    65                   | System.Windows.Forms.AnchorStyles.Left)
    66                   | System.Windows.Forms.AnchorStyles.Right)));
    67       this.parameterCollectionView.Caption = "ParameterCollection View";
    68       this.parameterCollectionView.Content = null;
    69       this.parameterCollectionView.Location = new System.Drawing.Point(3, 0);
    70       this.parameterCollectionView.Name = "parameterCollectionView";
    71       this.parameterCollectionView.ReadOnly = false;
    72       this.parameterCollectionView.Size = new System.Drawing.Size(713, 387);
    73       this.parameterCollectionView.TabIndex = 4;
     89      this.problemTabPage.Controls.Add(this.parameterCollectionView);
     90      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
     91      this.problemTabPage.Name = "problemTabPage";
     92      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
     93      this.problemTabPage.Size = new System.Drawing.Size(497, 277);
     94      this.problemTabPage.TabIndex = 0;
     95      this.problemTabPage.Text = "Problem";
     96      this.problemTabPage.UseVisualStyleBackColor = true;
    7497      //
    75       // tabControl1
     98      // visualizationTabPage
    7699      //
    77       this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    78                   | System.Windows.Forms.AnchorStyles.Left)
    79                   | System.Windows.Forms.AnchorStyles.Right)));
    80       this.tabControl1.Controls.Add(this.tabPage1);
    81       this.tabControl1.Controls.Add(this.tabPage2);
    82       this.tabControl1.Location = new System.Drawing.Point(6, 56);
    83       this.tabControl1.Name = "tabControl1";
    84       this.tabControl1.SelectedIndex = 0;
    85       this.tabControl1.Size = new System.Drawing.Size(724, 413);
    86       this.tabControl1.TabIndex = 5;
    87       //
    88       // tabPage1
    89       //
    90       this.tabPage1.Controls.Add(this.parameterCollectionView);
    91       this.tabPage1.Location = new System.Drawing.Point(4, 22);
    92       this.tabPage1.Name = "tabPage1";
    93       this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
    94       this.tabPage1.Size = new System.Drawing.Size(716, 387);
    95       this.tabPage1.TabIndex = 0;
    96       this.tabPage1.Text = "Problem";
    97       this.tabPage1.UseVisualStyleBackColor = true;
    98       //
    99       // tabPage2
    100       //
    101       this.tabPage2.Controls.Add(this.ganttChart);
    102       this.tabPage2.Location = new System.Drawing.Point(4, 22);
    103       this.tabPage2.Name = "tabPage2";
    104       this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
    105       this.tabPage2.Size = new System.Drawing.Size(716, 387);
    106       this.tabPage2.TabIndex = 1;
    107       this.tabPage2.Text = "Visualization";
    108       this.tabPage2.UseVisualStyleBackColor = true;
     100      this.visualizationTabPage.Controls.Add(this.ganttChart);
     101      this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
     102      this.visualizationTabPage.Name = "visualizationTabPage";
     103      this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
     104      this.visualizationTabPage.Size = new System.Drawing.Size(497, 277);
     105      this.visualizationTabPage.TabIndex = 1;
     106      this.visualizationTabPage.Text = "Visualization";
     107      this.visualizationTabPage.UseVisualStyleBackColor = true;
    109108      //
    110109      // ganttChart
    111110      //
    112       this.ganttChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    113                   | System.Windows.Forms.AnchorStyles.Left)
    114                   | System.Windows.Forms.AnchorStyles.Right)));
    115       this.ganttChart.Location = new System.Drawing.Point(0, 3);
     111      this.ganttChart.Dock = System.Windows.Forms.DockStyle.Fill;
     112      this.ganttChart.Location = new System.Drawing.Point(3, 3);
    116113      this.ganttChart.Name = "ganttChart";
    117       this.ganttChart.Size = new System.Drawing.Size(716, 384);
     114      this.ganttChart.Size = new System.Drawing.Size(491, 271);
    118115      this.ganttChart.TabIndex = 0;
    119116      //
     
    122119      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    123120      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    124       this.Controls.Add(this.tabControl1);
    125       this.Controls.Add(this.importButton);
    126121      this.Name = "JobShopSchedulingProblemView";
    127       this.Size = new System.Drawing.Size(733, 472);
    128       this.Controls.SetChildIndex(this.importButton, 0);
    129       this.Controls.SetChildIndex(this.nameLabel, 0);
    130       this.Controls.SetChildIndex(this.nameTextBox, 0);
    131       this.Controls.SetChildIndex(this.infoLabel, 0);
    132       this.Controls.SetChildIndex(this.tabControl1, 0);
     122      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
     123      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
     124      this.problemInstanceSplitContainer.Panel2.PerformLayout();
     125      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
     126      this.problemInstanceSplitContainer.ResumeLayout(false);
    133127      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    134       this.tabControl1.ResumeLayout(false);
    135       this.tabPage1.ResumeLayout(false);
    136       this.tabPage2.ResumeLayout(false);
     128      this.problemTabControl.ResumeLayout(false);
     129      this.problemTabPage.ResumeLayout(false);
     130      this.visualizationTabPage.ResumeLayout(false);
    137131      this.ResumeLayout(false);
    138       this.PerformLayout();
    139132
    140133    }
     
    142135    #endregion
    143136
    144     private System.Windows.Forms.Button importButton;
    145     private Core.Views.ParameterCollectionView parameterCollectionView;
    146     private System.Windows.Forms.TabControl tabControl1;
    147     private System.Windows.Forms.TabPage tabPage1;
    148     private System.Windows.Forms.TabPage tabPage2;
     137    private System.Windows.Forms.TabControl problemTabControl;
     138    private System.Windows.Forms.TabPage problemTabPage;
     139    private System.Windows.Forms.TabPage visualizationTabPage;
    149140    private GanttChart ganttChart;
    150141  }
Note: See TracChangeset for help on using the changeset viewer.