Changeset 8882 for trunk/sources/HeuristicLab.Problems.Scheduling.Views

Timestamp:

11/08/12 13:31:18 (12 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

Location:

trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3

Files:

• HeuristicLab.Problems.Scheduling.Views-3.3.csproj (modified) (4 diffs)
• JobShopSchedulingProblemView.Designer.cs (modified) (4 diffs)
• JobShopSchedulingProblemView.cs (modified) (4 diffs)
• JobShopSchedulingProblemView.resx (deleted)
• Plugin.cs.frame (modified) (1 diff)
• SchedulingProblemImportDialog.Designer.cs (deleted)
• SchedulingProblemImportDialog.cs (deleted)
• SchedulingProblemImportDialog.resx (deleted)

trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj

@@ -115 +115 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SchedulingProblemImportDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SchedulingProblemImportDialog.Designer.cs">
-      <DependentUpon>SchedulingProblemImportDialog.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -128 +122 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="JobShopSchedulingProblemView.resx">
-      <DependentUpon>JobShopSchedulingProblemView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SchedulingProblemImportDialog.resx">
-      <DependentUpon>SchedulingProblemImportDialog.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
@@ -176 +162 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
@@ -185 +176 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.Scheduling\3.3\HeuristicLab.Problems.Scheduling-3.3.csproj">

trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.Designer.cs

@@ -25 +25 @@
     /// </summary>
     private void InitializeComponent() {
-      this.importButton = new System.Windows.Forms.Button();
-      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
-      this.tabControl1 = new System.Windows.Forms.TabControl();
-      this.tabPage1 = new System.Windows.Forms.TabPage();
-      this.tabPage2 = new System.Windows.Forms.TabPage();
-      this.ganttChart = new GanttChart();
+      this.problemTabControl = new System.Windows.Forms.TabControl();
+      this.problemTabPage = new System.Windows.Forms.TabPage();
+      this.visualizationTabPage = new System.Windows.Forms.TabPage();
+      this.ganttChart = new HeuristicLab.Encodings.ScheduleEncoding.Views.GanttChart();
+      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
+      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
+      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
+      this.problemInstanceSplitContainer.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-      this.tabControl1.SuspendLayout();
-      this.tabPage1.SuspendLayout();
-      this.tabPage2.SuspendLayout();
+      this.problemTabControl.SuspendLayout();
+      this.problemTabPage.SuspendLayout();
+      this.visualizationTabPage.SuspendLayout();
       this.SuspendLayout();
+      // 
+      // problemInstanceSplitContainer
+      // 
+      this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+      this.problemInstanceSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      // 
+      // problemInstanceSplitContainer.Panel2
+      // 
+      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.problemTabControl);
+      // 
+      // ProblemInstanceConsumerViewHost
+      // 
+      this.ProblemInstanceConsumerViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+      this.ProblemInstanceConsumerViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.ProblemInstanceConsumerViewHost.Location = new System.Drawing.Point(0, 0);
+      this.ProblemInstanceConsumerViewHost.Size = new System.Drawing.Size(511, 26);
+      // 
+      // parameterCollectionView
+      // 
+      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
+      this.parameterCollectionView.Size = new System.Drawing.Size(491, 271);
       // 
       // nameTextBox
@@ -41 +66 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(650, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(439, 20);
       // 
       // infoLabel
       // 
-      this.infoLabel.Location = new System.Drawing.Point(714, 3);
+      this.infoLabel.Location = new System.Drawing.Point(492, 3);
       // 
-      // importButton
+      // problemTabControl
       // 
-      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.importButton.Location = new System.Drawing.Point(6, 26);
-      this.importButton.Name = "importButton";
-      this.importButton.Size = new System.Drawing.Size(724, 23);
-      this.importButton.TabIndex = 3;
-      this.importButton.Text = "Import";
-      this.importButton.UseVisualStyleBackColor = true;
-      this.importButton.Click += new System.EventHandler(this.importButton_Click);
+      this.problemTabControl.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.problemTabControl.Controls.Add(this.problemTabPage);
+      this.problemTabControl.Controls.Add(this.visualizationTabPage);
+      this.problemTabControl.Location = new System.Drawing.Point(3, 27);
+      this.problemTabControl.Name = "problemTabControl";
+      this.problemTabControl.SelectedIndex = 0;
+      this.problemTabControl.Size = new System.Drawing.Size(505, 303);
+      this.problemTabControl.TabIndex = 5;
       // 
-      // parameterCollectionView
+      // problemTabPage
       // 
-      this.parameterCollectionView.AllowEditingOfHiddenParameters = true;
-      this.parameterCollectionView.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.parameterCollectionView.Caption = "ParameterCollection View";
-      this.parameterCollectionView.Content = null;
-      this.parameterCollectionView.Location = new System.Drawing.Point(3, 0);
-      this.parameterCollectionView.Name = "parameterCollectionView";
-      this.parameterCollectionView.ReadOnly = false;
-      this.parameterCollectionView.Size = new System.Drawing.Size(713, 387);
-      this.parameterCollectionView.TabIndex = 4;
+      this.problemTabPage.Controls.Add(this.parameterCollectionView);
+      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
+      this.problemTabPage.Name = "problemTabPage";
+      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.problemTabPage.Size = new System.Drawing.Size(497, 277);
+      this.problemTabPage.TabIndex = 0;
+      this.problemTabPage.Text = "Problem";
+      this.problemTabPage.UseVisualStyleBackColor = true;
       // 
-      // tabControl1
+      // visualizationTabPage
       // 
-      this.tabControl1.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.tabControl1.Controls.Add(this.tabPage1);
-      this.tabControl1.Controls.Add(this.tabPage2);
-      this.tabControl1.Location = new System.Drawing.Point(6, 56);
-      this.tabControl1.Name = "tabControl1";
-      this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(724, 413);
-      this.tabControl1.TabIndex = 5;
-      // 
-      // tabPage1
-      // 
-      this.tabPage1.Controls.Add(this.parameterCollectionView);
-      this.tabPage1.Location = new System.Drawing.Point(4, 22);
-      this.tabPage1.Name = "tabPage1";
-      this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage1.Size = new System.Drawing.Size(716, 387);
-      this.tabPage1.TabIndex = 0;
-      this.tabPage1.Text = "Problem";
-      this.tabPage1.UseVisualStyleBackColor = true;
-      // 
-      // tabPage2
-      // 
-      this.tabPage2.Controls.Add(this.ganttChart);
-      this.tabPage2.Location = new System.Drawing.Point(4, 22);
-      this.tabPage2.Name = "tabPage2";
-      this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage2.Size = new System.Drawing.Size(716, 387);
-      this.tabPage2.TabIndex = 1;
-      this.tabPage2.Text = "Visualization";
-      this.tabPage2.UseVisualStyleBackColor = true;
+      this.visualizationTabPage.Controls.Add(this.ganttChart);
+      this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
+      this.visualizationTabPage.Name = "visualizationTabPage";
+      this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.visualizationTabPage.Size = new System.Drawing.Size(497, 277);
+      this.visualizationTabPage.TabIndex = 1;
+      this.visualizationTabPage.Text = "Visualization";
+      this.visualizationTabPage.UseVisualStyleBackColor = true;
       // 
       // ganttChart
       // 
-      this.ganttChart.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.ganttChart.Location = new System.Drawing.Point(0, 3);
+      this.ganttChart.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.ganttChart.Location = new System.Drawing.Point(3, 3);
       this.ganttChart.Name = "ganttChart";
-      this.ganttChart.Size = new System.Drawing.Size(716, 384);
+      this.ganttChart.Size = new System.Drawing.Size(491, 271);
       this.ganttChart.TabIndex = 0;
       // 
@@ -122 +119 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.tabControl1);
-      this.Controls.Add(this.importButton);
       this.Name = "JobShopSchedulingProblemView";
-      this.Size = new System.Drawing.Size(733, 472);
-      this.Controls.SetChildIndex(this.importButton, 0);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
-      this.Controls.SetChildIndex(this.tabControl1, 0);
+      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
+      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
+      this.problemInstanceSplitContainer.Panel2.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
+      this.problemInstanceSplitContainer.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-      this.tabControl1.ResumeLayout(false);
-      this.tabPage1.ResumeLayout(false);
-      this.tabPage2.ResumeLayout(false);
+      this.problemTabControl.ResumeLayout(false);
+      this.problemTabPage.ResumeLayout(false);
+      this.visualizationTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -142 +135 @@
     #endregion
 
-    private System.Windows.Forms.Button importButton;
-    private Core.Views.ParameterCollectionView parameterCollectionView;
-    private System.Windows.Forms.TabControl tabControl1;
-    private System.Windows.Forms.TabPage tabPage1;
-    private System.Windows.Forms.TabPage tabPage2;
+    private System.Windows.Forms.TabControl problemTabControl;
+    private System.Windows.Forms.TabPage problemTabPage;
+    private System.Windows.Forms.TabPage visualizationTabPage;
     private GanttChart ganttChart;
   }

trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
-using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.MainForm;
-using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.Problems.Scheduling.Views {
   [View("JobShop Scheduling Problem View")]
   [Content(typeof(JobShopSchedulingProblem), true)]
-  public partial class JobShopSchedulingProblemView : NamedItemView {
-    public JobShopSchedulingProblemView() {
-      InitializeComponent();
-    }
-    private SchedulingProblemImportDialog spImportDialog;
+  public partial class JobShopSchedulingProblemView : ProblemView {
 
     public new JobShopSchedulingProblem Content {
@@ -42 +34 @@
     }
 
+    public JobShopSchedulingProblemView() {
+      InitializeComponent();
+      Controls.Remove(parameterCollectionView);
+      parameterCollectionView.Dock = DockStyle.Fill;
+      problemTabPage.Controls.Add(parameterCollectionView);
+    }
+
     protected override void OnContentChanged() {
       base.OnContentChanged();
       if (Content == null) {
-        parameterCollectionView.Content = null;
         ganttChart.Reset();
       } else {
-        parameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
         FillGanttChart(Content);
       }
@@ -54 +51 @@
 
     private void FillGanttChart(JobShopSchedulingProblem content) {
-      //Add Jobs as Categories
       ganttChart.Reset();
       int jobCount = 0;
-      Random random = new Random(1);
-      foreach (Job j in content.JobData) {
+      foreach (var j in content.JobData) {
         double lastEndTime = 0;
-        foreach (Task t in content.JobData[jobCount].Tasks) {
+        foreach (var t in content.JobData[jobCount].Tasks) {
           int categoryNr = t.JobNr;
           string categoryName = "Job" + categoryNr;
@@ -74 +69 @@
       }
     }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      parameterCollectionView.Enabled = Content != null;
-      importButton.Enabled = Content != null && !ReadOnly;
-    }
-
-    private void importButton_Click(object sender, EventArgs e) {
-      if (spImportDialog == null) spImportDialog = new SchedulingProblemImportDialog();
-
-      if (spImportDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          switch (spImportDialog.Format) {
-            case SPFormat.ORLib:
-              Content.ImportFromORLibrary(spImportDialog.SPFileName);
-              break;
-          }
-
-
-          if (!string.IsNullOrEmpty(spImportDialog.OptimalScheduleFileName))
-            Content.ImportJSMSolution(spImportDialog.OptimalScheduleFileName);
-          OnContentChanged();
-        }
-        catch (Exception ex) {
-          ErrorHandling.ShowErrorDialog(this, ex);
-        }
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.Problems.Scheduling.Views/3.3/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Problems.Scheduling", "3.3")]
   public class HeuristicLabProblemsSchedulingViewsPlugin : PluginBase {