Changeset 8882

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

Files:

• HeuristicLab 3.3.sln (modified) (4 diffs)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Scheduling (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3 (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/Data (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/Data/JSSPORLIB.zip (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/HeuristicLab.Problems.Instances.Scheduling-3.3.csproj (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/JSSPORLIBDataDescriptor.cs (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/JSSPORLIBInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/JSSPORLIBParser.cs (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/Properties (added)
• HeuristicLab.Problems.Instances.Scheduling/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.Instances/3.3/Types/JSSPData.cs (added)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.cs (modified) (4 diffs)
• HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.resx (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Scheduling.Views/3.3/SchedulingProblemImportDialog.Designer.cs (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/SchedulingProblemImportDialog.cs (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/SchedulingProblemImportDialog.resx (deleted)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs (modified) (4 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (5 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab 3.3.sln

@@ -88 +88 @@
     {B7A64A60-B538-479F-9C47-A3180C458F6C} = {B7A64A60-B538-479F-9C47-A3180C458F6C}
     {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF}
+    {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB}
     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}
     {56F9106A-079F-4C61-92F6-86A84C2D84B7} = {56F9106A-079F-4C61-92F6-86A84C2D84B7}
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F} = {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}
     {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3} = {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}
     {3C906172-E044-4DF0-B4FD-AA21192D5D3E} = {3C906172-E044-4DF0-B4FD-AA21192D5D3E}
@@ -129 +131 @@
     {66D249C3-A01D-42A8-82A2-919BC8EC3D83} = {66D249C3-A01D-42A8-82A2-919BC8EC3D83}
     {E4CFB0C3-0589-4893-B38E-8BEDF885C765} = {E4CFB0C3-0589-4893-B38E-8BEDF885C765}
+    {E6CB1FC5-78EC-4EB8-BF12-35303C36F962} = {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}
     {79271BC8-4446-40E2-BB89-9BE4E17174FE} = {79271BC8-4446-40E2-BB89-9BE4E17174FE}
     {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086} = {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}
@@ -370 +373 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4.csproj", "{E6CB1FC5-78EC-4EB8-BF12-35303C36F962}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Scheduling-3.3", "HeuristicLab.Problems.Instances.Scheduling\3.3\HeuristicLab.Problems.Instances.Scheduling-3.3.csproj", "{9D792B6D-836B-46DC-9D69-50B4B1E7B87F}"
 EndProject
 Global
@@ -1809 +1814 @@
     {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}.Release|x86.ActiveCfg = Release|x86
     {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}.Release|x86.Build.0 = Release|x86
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|x64.ActiveCfg = Debug|x64
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|x64.Build.0 = Debug|x64
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|x86.ActiveCfg = Debug|x86
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Debug|x86.Build.0 = Debug|x86
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|Any CPU.Build.0 = Release|Any CPU
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x64.ActiveCfg = Release|x64
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x64.Build.0 = Release|x64
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x86.ActiveCfg = Release|x86
+    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs

@@ -43 +43 @@
 
     public static void Apply(IRandom random, PRVEncoding individual) {
-      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, 2 } }));
+      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, individual.NrOfRules.Value } }));
     }
 

trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

@@ -115 +115 @@
     <Compile Include="IProblemInstanceExporter.cs" />
     <Compile Include="Types\ATSPData.cs" />
+    <Compile Include="Types\JSSPData.cs" />
     <Compile Include="Types\CTAPData.cs" />
     <Compile Include="IDataDescriptor.cs" />
@@ -152 +153 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -158 +159 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

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

@@ -212 +212 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -220 +220 @@
 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs

@@ -120 +120 @@
       this.qapView.Location = new System.Drawing.Point(3, 3);
       this.qapView.Name = "qapView";
-      this.qapView.Size = new System.Drawing.Size(497, 245);
+      this.qapView.Size = new System.Drawing.Size(497, 274);
       this.qapView.TabIndex = 0;
       this.qapView.Weights = null;
@@ -126 +126 @@
       // QuadraticAssignmentProblemView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Name = "QuadraticAssignmentProblemView";

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs

@@ -53 +53 @@
     }
 
-    private void DistanceMatrixParameter_ValueChanged(object sender, System.EventArgs e) {
+    private void DistanceMatrixParameter_ValueChanged(object sender, EventArgs e) {
       qapView.Distances = Content.Distances;
     }
 
-    private void WeightsParameter_ValueChanged(object sender, System.EventArgs e) {
+    private void WeightsParameter_ValueChanged(object sender, EventArgs e) {
       qapView.Weights = Content.Weights;
     }
 
-    private void BestKnownSolutionParameter_ValueChanged(object sender, System.EventArgs e) {
+    private void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
       qapView.Assignment = Content.BestKnownSolution;
     }
@@ -77 +77 @@
       }
     }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-    }
   }
 }

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 {

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -41 +42 @@
     public MakespanEvaluator() : base() { }
 
-    protected override DoubleValue evaluate(Schedule schedule) {
-      DoubleValue quality = new DoubleValue(0);
-      foreach (Resource r in schedule.Resources) {
-        if (r.TotalDuration > quality.Value) {
-          quality.Value = r.TotalDuration;
-        }
-      }
-      return quality;
+    public static double GetMakespan(Schedule schedule) {
+      return schedule.Resources.Select(r => r.TotalDuration).Max();
+    }
+
+    protected override DoubleValue Evaluate(Schedule schedule) {
+      return new DoubleValue(GetMakespan(schedule));
     }
 

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +33 @@
   [StorableClass]
   public class MeanTardinessEvaluator : SchedulingEvaluator, IJSSPOperator {
+
     [StorableConstructor]
     protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
-    protected MeanTardinessEvaluator(MeanTardinessEvaluator original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected MeanTardinessEvaluator(MeanTardinessEvaluator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new MeanTardinessEvaluator(this, cloner);
@@ -45 +46 @@
     }
     #endregion
-    #region Properties
-    public ItemList<Job> JobData {
-      get { return JobDataParameter.ActualValue; }
-    }
-    #endregion
 
     public MeanTardinessEvaluator()
@@ -56 +52 @@
     }
 
-    protected override DoubleValue evaluate(Schedule schedule) {
-      double totalTardiness = 0;
-      foreach (Resource r in schedule.Resources) {
-        double tardiness = r.Tasks[r.Tasks.Count - 1].EndTime - JobData[r.Tasks[r.Tasks.Count - 1].JobNr].DueDate;
-        if (tardiness > 0)
-          totalTardiness += tardiness;
-      }
-      return new DoubleValue(totalTardiness / schedule.Resources.Count);
+    public static double GetMeanTardiness(Schedule schedule, ItemList<Job> jobData) {
+      return schedule.Resources
+        .Select(r => Math.Max(0, r.Tasks.Last().EndTime - jobData[r.Tasks.Last().JobNr].DueDate))
+        .Average();
     }
 
-    public override IOperation Apply() {
-      return base.Apply();
+    protected override DoubleValue Evaluate(Schedule schedule) {
+      return new DoubleValue(GetMeanTardiness(schedule, JobDataParameter.ActualValue));
     }
   }

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs

@@ -61 +61 @@
     }
 
-    protected abstract DoubleValue evaluate(Schedule schedule);
+    protected abstract DoubleValue Evaluate(Schedule schedule);
 
     public override IOperation Apply() {
       Schedule schedule = ScheduleParameter.ActualValue;
-      QualityParameter.ActualValue = evaluate(schedule);
+      QualityParameter.ActualValue = Evaluate(schedule);
       return base.Apply();
     }

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

@@ -193 +193 @@
       <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>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.Scheduling {
-  [Item("JobShop Scheduling Problem", "Represents a standard JobShop Scheduling Problem")]
+  [Item("Job Shop Scheduling Problem", "Represents a standard Job Shop Scheduling Problem")]
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class JobShopSchedulingProblem : SchedulingProblem, IStorableContent {
+  public sealed class JobShopSchedulingProblem : SchedulingProblem, IProblemInstanceConsumer<JSSPData>, IProblemInstanceExporter<JSSPData>, IStorableContent {
+    #region Default Instance
+    private static readonly JSSPData DefaultInstance = new JSSPData() {
+      Jobs = 10,
+      Resources = 10,
+      BestKnownQuality = 930,
+      ProcessingTimes = new double[,] {
+          { 29, 78,  9, 36, 49, 11, 62, 56, 44, 21 },
+          { 43, 90, 75, 11, 69, 28, 46, 46, 72, 30 },
+          { 91, 85, 39, 74, 90, 10, 12, 89, 45, 33 },
+          { 81, 95, 71, 99,  9, 52, 85, 98, 22, 43 },
+          { 14,  6, 22, 61, 26, 69, 21, 49, 72, 53 },
+          { 84,  2, 52, 95, 48, 72, 47, 65,  6, 25 },
+          { 46, 37, 61, 13, 32, 21, 32, 89, 30, 55 },
+          { 31, 86, 46, 74, 32, 88, 19, 48, 36, 79 },
+          { 76, 69, 76, 51, 85, 11, 40, 89, 26, 74 },
+          { 85, 13, 61,  7, 64, 76, 47, 52, 90, 45 }
+        },
+      Demands = new int[,] {
+          { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+          { 0, 2, 4, 9, 3, 1, 6, 5, 7, 8 },
+          { 1, 0, 3, 2, 8, 5, 7, 6, 9, 4 },
+          { 1, 2, 0, 4, 6, 8, 7, 3, 9, 5 },
+          { 2, 0, 1, 5, 3, 4, 8, 7, 9, 6 },
+          { 2, 1, 5, 3, 8, 9, 0, 6, 4, 7 },
+          { 1, 0, 3, 2, 6, 5, 9, 8, 7, 4 },
+          { 2, 0, 1, 5, 4, 6, 8, 9, 7, 3 },
+          { 0, 1, 3, 5, 2, 9, 6, 7, 4, 8 },
+          { 1, 0, 2, 6, 8, 9, 5, 3, 4, 7 }
+        }
+    };
+    #endregion
+
     #region Parameter Properties
     public ValueParameter<ItemList<Job>> JobDataParameter {
@@ -105 +135 @@
 
       InitializeOperators();
-      InitializeProblemInstance();
+      Load(DefaultInstance);
     }
 
@@ -121 +151 @@
       InitializeOperators();
     }
-
-    protected override void OnEvaluatorChanged() {
-      base.OnEvaluatorChanged();
+    #endregion
+
+    #region Problem Instance Handling
+    public void Load(JSSPData data) {
+      var jobData = new ItemList<Job>(data.Jobs);
+      for (int j = 0; j < data.Jobs; j++) {
+        var job = new Job(j, data.DueDates != null ? data.DueDates[j] : double.MaxValue);
+        for (int t = 0; t < data.Resources; t++) {
+          job.Tasks.Add(new Task(t, data.Demands[j, t], j, data.ProcessingTimes[j, t]));
+        }
+        jobData.Add(job);
+      }
+
+      if (data.BestKnownQuality.HasValue) BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
+      else BestKnownQuality = null;
+      if (data.BestKnownSchedule != null) {
+        var enc = new JSMEncoding();
+        enc.JobSequenceMatrix = new ItemList<Permutation>(data.Resources);
+        for (int i = 0; i < data.Resources; i++) {
+          enc.JobSequenceMatrix[i] = new Permutation(PermutationTypes.Absolute, new int[data.Jobs]);
+          for (int j = 0; j < data.Jobs; j++) {
+            enc.JobSequenceMatrix[i][j] = data.BestKnownSchedule[i, j];
+          }
+        }
+        BestKnownSolution = new JSMDecoder().CreateScheduleFromEncoding(enc, jobData);
+        if (SolutionEvaluator is MeanTardinessEvaluator)
+          BestKnownQuality = new DoubleValue(MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData));
+        else if (SolutionEvaluator is MakespanEvaluator)
+          BestKnownQuality = new DoubleValue(MakespanEvaluator.GetMakespan(BestKnownSolution));
+      }
+
+      JobData = jobData;
+      Jobs = new IntValue(data.Jobs);
+      Resources = new IntValue(data.Resources);
+      DueDates = new BoolValue(data.DueDates != null);
+    }
+
+    public JSSPData Export() {
+      var result = new JSSPData {
+        Name = Name,
+        Description = Description,
+        Jobs = Jobs.Value,
+        Resources = Resources.Value,
+        ProcessingTimes = new double[Jobs.Value, Resources.Value],
+        Demands = new int[Jobs.Value, Resources.Value],
+        DueDates = (DueDates.Value ? new double[Jobs.Value] : null)
+      };
+
+      foreach (var job in JobData) {
+        var counter = 0;
+        if (DueDates.Value) result.DueDates[job.Index] = job.DueDate;
+        foreach (var task in job.Tasks) {
+          result.ProcessingTimes[task.JobNr, counter] = task.Duration;
+          result.Demands[task.JobNr, counter] = task.ResourceNr;
+          counter++;
+        }
+      }
+      return result;
     }
     #endregion
 
     #region Helpers
-    private void InitializeProblemInstance() {
-      Jobs = new IntValue(10);
-      Resources = new IntValue(10);
-      BestKnownQuality = new DoubleValue(930);
-      JobData = new ItemList<Job>();
-      List<string> data = new List<string>
-      {"0 29 1 78 2  9 3 36 4 49 5 11 6 62 7 56 8 44 9 21",
-       "0 43 2 90 4 75 9 11 3 69 1 28 6 46 5 46 7 72 8 30",
-       "1 91 0 85 3 39 2 74 8 90 5 10 7 12 6 89 9 45 4 33",
-       "1 81 2 95 0 71 4 99 6  9 8 52 7 85 3 98 9 22 5 43",
-       "2 14 0  6 1 22 5 61 3 26 4 69 8 21 7 49 9 72 6 53",
-       "2 84 1  2 5 52 3 95 8 48 9 72 0 47 6 65 4  6 7 25",
-       "1 46 0 37 3 61 2 13 6 32 5 21 9 32 8 89 7 30 4 55",
-       "2 31 0 86 1 46 5 74 4 32 6 88 8 19 9 48 7 36 3 79",
-       "0 76 1 69 3 76 5 51 2 85 9 11 6 40 7 89 4 26 8 74",
-       "1 85 0 13 2 61 6  7 8 64 9 76 5 47 3 52 4 90 7 45" };
-
-      int jobCount = 0;
-      foreach (string s in data) {
-        List<string> split = SplitString(s);
-        JobData.Add(CreateJobFromData(split, jobCount++));
-      }
-    }
-
     private void InitializeOperators() {
       Operators.Clear();
@@ -159 +220 @@
 
     private void ApplyEncoding() {
-      if (SolutionCreator.GetType().Equals(typeof(JSMRandomCreator))) {
+      if (SolutionCreator.GetType() == typeof(JSMRandomCreator)) {
         Operators.AddRange(ApplicationManager.Manager.GetInstances<IJSMOperator>());
-        JSMDecoder decoder = new JSMDecoder();
-        ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<JSMEncoding>(decoder);
-      } else {
-        if (SolutionCreator.GetType().Equals(typeof(PRVRandomCreator))) {
-          Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
-          PRVDecoder decoder = new PRVDecoder();
-          ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PRVEncoding>(decoder);
-        } else {
-          if (SolutionCreator.GetType().Equals(typeof(PWRRandomCreator))) {
-            Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
-            PWRDecoder decoder = new PWRDecoder();
-            ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PWREncoding>(decoder);
-          } else {
-            if (SolutionCreator.GetType().Equals(typeof(DirectScheduleRandomCreator))) {
-              Operators.AddRange(ApplicationManager.Manager.GetInstances<IDirectScheduleOperator>());
-              ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<Schedule>();
-            }
-          }
-        }
-      }
-    }
-    #endregion
-
-    #region Importmethods
-    private List<string> SplitString(string line) {
-      if (line == null)
-        return null;
-      List<string> data = new List<string>(line.Split(' '));
-      List<string> result = new List<string>();
-
-      foreach (string s in data) {
-        if (!String.IsNullOrEmpty(s) && s != "" && s != " ")
-          result.Add(s);
-      }
-
-      return result;
-    }
-    private int[] GetIntArray(List<string> data) {
-      int[] arr = new int[data.Count];
-      for (int i = 0; i < data.Count; i++) {
-        arr[i] = Int32.Parse(data[i]);
-      }
-      return arr;
-    }
-    private Job CreateJobFromData(List<string> data, int jobCount) {
-      double dueDate = 0;
-      int dataCount = data.Count;
-      if (DueDates.Value) {
-        dueDate = Double.Parse(data[data.Count - 1]);
-        dataCount--;
-      }
-      Job j = new Job(jobCount, dueDate);
-      for (int i = 0; i < dataCount; i++) {
-        Task t = new Task(i / 2, Int32.Parse(data[i]), jobCount, Double.Parse(data[i + 1]));
-        j.Tasks.Add(t);
-        i++;
-      }//for
-      return j;
-    }
-
-    public void ImportFromORLibrary(string fileName) {
-      if (!File.Exists(fileName))
-        return;
-      StreamReader problemFile = new StreamReader(fileName);
-      //assures that the parser only reads the first problem instance given in the file
-      bool problemFound = false;
-
-      JobData = new ItemList<Job>();
-
-      while (!problemFile.EndOfStream && !problemFound) {
-        string line = problemFile.ReadLine();
-        List<string> data = SplitString(line);
-        if (data.Count > 0 && ((int)data[0][0] >= 48 && (int)data[0][0] <= 57)) {
-          int jobCount = 0;
-          Jobs = new IntValue(Int32.Parse(data[0]));
-          Resources = new IntValue(Int32.Parse(data[1]));
-          //data[2] = bestKnownQuality (double)
-          //data[3] = dueDates (0|1)
-          DueDates.Value = false;
-          if (data.Count > 2)
-            BestKnownQualityParameter.ActualValue = new DoubleValue(Double.Parse(data[2]));
-          if (data.Count > 3 && data[3] == "1")
-            DueDates.Value = true;
-          line = problemFile.ReadLine();
-          data = SplitString(line);
-          while (!problemFile.EndOfStream && data.Count > 0 && ((int)data[0][0] >= 48 && (int)data[0][0] <= 57)) {
-            Job j = CreateJobFromData(data, jobCount);
-            this.JobData.Add(j);
-            jobCount++;
-            line = problemFile.ReadLine();
-            data = SplitString(line);
-          }//while
-          problemFound = true;
-        }//if
-      }//while
-      problemFile.Close();
-    }
-
-    public void ImportJSMSolution(string fileName) {
-      if (!File.Exists(fileName))
-        return;
-      StreamReader solutionFile = new StreamReader(fileName);
-      //assures that the parser only reads the first solution instance given in the file
-      bool solutionFound = false;
-      JSMEncoding solution = new JSMEncoding();
-      while (!solutionFile.EndOfStream && !solutionFound) {
-
-        string line = solutionFile.ReadLine();
-        List<string> data = SplitString(line);
-        if (data.Count > 0 && ((int)data[0][0] >= 48 && (int)data[0][0] <= 57)) {
-          if (data.Count > 2)
-            BestKnownQualityParameter.ActualValue = new DoubleValue(Double.Parse(data[2]));
-          line = solutionFile.ReadLine();
-          data = SplitString(line);
-          while (data != null && data.Count > 0 && ((int)data[0][0] >= 48 && (int)data[0][0] <= 57)) {
-            Permutation p = new Permutation(PermutationTypes.Absolute, GetIntArray(data));
-            solution.JobSequenceMatrix.Add(p);
-
-            line = solutionFile.ReadLine();
-            data = SplitString(line);
-          }//while
-          solutionFound = true;
-        }//if
-      }//while
-      solutionFile.Close();
-
-      JSMDecoder decoder = new JSMDecoder();
-      Schedule result = decoder.CreateScheduleFromEncoding(solution, JobData);
-      BestKnownSolution = result;
+        var decoder = new JSMDecoder();
+        ((SchedulingEvaluationAlgorithm)EvaluatorParameter.ActualValue).InitializeOperatorGraph(decoder);
+      } else if (SolutionCreator.GetType() == typeof(PRVRandomCreator)) {
+        Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
+        var decoder = new PRVDecoder();
+        ((SchedulingEvaluationAlgorithm)EvaluatorParameter.ActualValue).InitializeOperatorGraph(decoder);
+      } else if (SolutionCreator.GetType() == typeof(PWRRandomCreator)) {
+        Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
+        var decoder = new PWRDecoder();
+        ((SchedulingEvaluationAlgorithm)EvaluatorParameter.ActualValue).InitializeOperatorGraph(decoder);
+      } else if (SolutionCreator.GetType() == typeof(DirectScheduleRandomCreator)) {
+        Operators.AddRange(ApplicationManager.Manager.GetInstances<IDirectScheduleOperator>());
+        ((SchedulingEvaluationAlgorithm)EvaluatorParameter.ActualValue).InitializeOperatorGraph<Schedule>();
+      }
     }
     #endregion

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

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsSchedulingPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -230 +230 @@
     <Reference Include="HeuristicLab.Problems.Instances.QAPLIB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\bin\HeuristicLab.Problems.Instances.QAPLIB-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances.Scheduling-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\bin\HeuristicLab.Problems.Instances.Scheduling-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Problems.Instances.TSPLIB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">