Changeset 6293

Timestamp:

05/26/11 10:25:04 (14 years ago)

Author:

jhelm

Message:

#1329: Did some heavy refactoring after "code-review meeting". Added Encodings.SchedulingEncoding plugin to store encodings used in scheduling problems.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Files:

• Analyzers/BestSchedulingSolutionAnalyzer.cs (modified) (1 diff)
• Analyzers/SchedulingAnalyzer.cs (modified) (1 diff)
• Decoders (added)
• Decoders/GTAlgorithmUtils.cs (added)
• Decoders/JSMDecoder.cs (added)
• Decoders/JSMDecodingErrorPolicyTypes.cs (added)
• Decoders/JSMForcingStrategyTypes.cs (added)
• Decoders/PRVDecoder.cs (added)
• Decoders/PWRDecoder.cs (added)
• Encodings (deleted)
• Evaluators/MakespanEvaluator.cs (modified) (1 diff)
• Evaluators/MeanTardinessEvaluator.cs (modified) (3 diffs)
• Evaluators/SchedulingEvaluationAlgorithm.cs (modified) (1 diff)
• Evaluators/SchedulingEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling-3.3.csproj (modified) (2 diffs)
• IndexedTaskList.cs (added)
• Interfaces/IJSMOperator.cs (deleted)
• Interfaces/IJSSPEncoding.cs (deleted)
• Interfaces/IJSSPOperator.cs (deleted)
• Interfaces/IPRVOperator.cs (deleted)
• Interfaces/IPWROperator.cs (deleted)
• Interfaces/ISchedulingCreator.cs (deleted)
• Interfaces/ISchedulingCrossover.cs (deleted)
• Interfaces/ISchedulingDecoder.cs (deleted)
• Interfaces/ISchedulingEncoding.cs (deleted)
• Interfaces/ISchedulingEvaluator.cs (deleted)
• Interfaces/ISchedulingManipulator.cs (deleted)
• Interfaces/ISchedulingOperator.cs (deleted)
• JSSPJob.cs (deleted)
• JSSPTask.cs (deleted)
• Job.cs (added)
• JobShopSchedulingProblem.cs (modified) (11 diffs)
• Plugin.cs (added)
• Resource.cs (deleted)
• Schedule.cs (deleted)
• SchedulingProblem.cs (modified) (1 diff)
• Task.cs (added)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Analyzers/BestSchedulingSolutionAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Data;
-using HeuristicLab.Problems.Scheduling.Encodings;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Analyzers {

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Analyzers/SchedulingAnalyzer.cs

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Analyzers {

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

@@ -30 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs

@@ -30 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.Scheduling.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {
   [Item("Men tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
   [StorableClass]
-  public class MeanTardinessEvaluator : SchedulingEvaluator, IJSSPOperator {
+  public class MeanTardinessEvaluator : SchedulingEvaluator {
     [StorableConstructor]
     protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
@@ -46 +46 @@
 
     #region Parameter Properties
-    public ILookupParameter<ItemList<JSSPJob>> JobsParameter {
-      get { return (ILookupParameter<ItemList<JSSPJob>>)Parameters["Jobs"]; }
+    public ILookupParameter<ItemList<Job>> JobsParameter {
+      get { return (ILookupParameter<ItemList<Job>>)Parameters["Jobs"]; }
     }
     #endregion
     #region Properties
-    public ItemList<JSSPJob> Jobs {
+    public ItemList<Job> Jobs {
       get { return JobsParameter.ActualValue; }
     }
@@ -57 +57 @@
 
     public MeanTardinessEvaluator() : base() {
-      Parameters.Add(new LookupParameter<ItemList<JSSPJob>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
+      Parameters.Add(new LookupParameter<ItemList<Job>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
     }
 

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluationAlgorithm.cs

@@ -31 +31 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.Scheduling.Interfaces;
-using HeuristicLab.Problems.Scheduling.Encodings;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.JobSequenceMatrix;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using System;
-using HeuristicLab.Problems.Scheduling.Encodings;
 using HeuristicLab.Operators;
-using HeuristicLab.Problems.Scheduling.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj

@@ -50 +50 @@
     <Compile Include="Analyzers\BestSchedulingSolutionAnalyzer.cs" />
     <Compile Include="Analyzers\SchedulingAnalyzer.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JSSPManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JSSPDecoder.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JSSPCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\JSMDecodingErrorPolicyTypes.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Crossovers\JSMJOXCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Crossovers\JSMCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Crossovers\JSMOXCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Crossovers\JSMSXXCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\JSMDecoder.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\JSMForcingStrategyTypes.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\JSMRandomCreator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\JSMEncoding.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Manipulators\JSMShiftChangeManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Manipulators\JSMManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JobSequenceMatrix\Manipulators\JSMSwapManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JSSPCreator.cs" />
-    <Compile Include="Encodings\SchedulingCrossover.cs" />
-    <Compile Include="Encodings\SchedulingDecoder.cs" />
-    <Compile Include="Encodings\JobShopScheduling\JSSPEncodingTypes.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\Crossovers\PWRGOXCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\Crossovers\PWRCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\Crossovers\PWRPPXCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\Manipulators\PWRUniformOnePositionManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\Manipulators\PWRManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\PWRDecoder.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\PWREncoding.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PermutationWithRepetition\PWRRandomCreator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\Crossovers\PRVSinglePointCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\Crossovers\PRVDiscreteCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\Manipulators\PRVUniformOnePositionManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\PRVEncoding.cs" />
+    <Compile Include="Decoders\GTAlgorithmUtils.cs" />
+    <Compile Include="Decoders\JSMDecoder.cs" />
+    <Compile Include="Decoders\JSMDecodingErrorPolicyTypes.cs" />
+    <Compile Include="Decoders\JSMForcingStrategyTypes.cs" />
+    <Compile Include="Decoders\PRVDecoder.cs" />
+    <Compile Include="Decoders\PWRDecoder.cs" />
     <Compile Include="Evaluators\SchedulingEvaluatorType.cs" />
     <Compile Include="Evaluators\SchedulingEvaluatorTypes.cs" />
     <Compile Include="Evaluators\MeanTardinessEvaluator.cs" />
-    <Compile Include="Interfaces\IJSSPEncoding.cs" />
-    <Compile Include="Interfaces\ISchedulingDecoder.cs" />
-    <Compile Include="Interfaces\ISchedulingOperator.cs" />
-    <Compile Include="Interfaces\IPWROperator.cs" />
-    <Compile Include="Interfaces\IPRVOperator.cs" />
-    <Compile Include="Interfaces\ISchedulingEncoding.cs" />
-    <Compile Include="Encodings\SchedulingCreator.cs" />
-    <Compile Include="Encodings\SchedulingManipulator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\Crossovers\PRVCrossover.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\PRVDecoder.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\PRVRandomCreator.cs" />
-    <Compile Include="Encodings\JobShopScheduling\PriorityRulesVector\Manipulators\PRVManipulator.cs" />
     <Compile Include="Evaluators\MakespanEvaluator.cs" />
+    <Compile Include="Evaluators\SchedulingEvaluator.cs" />
     <Compile Include="IndexedTaskList.cs" />
-    <Compile Include="Interfaces\IJSMOperator.cs" />
-    <Compile Include="Interfaces\ISchedulingCrossover.cs" />
-    <Compile Include="Interfaces\ISchedulingManipulator.cs" />
-    <Compile Include="Interfaces\ISchedulingCreator.cs" />
-    <Compile Include="Interfaces\ISchedulingEvaluator.cs" />
-    <Compile Include="Resource.cs" />
-    <Compile Include="Evaluators\SchedulingEvaluator.cs" />
-    <Compile Include="JSSPJob.cs" />
+    <Compile Include="Interfaces\IJSSPOperator.cs" />
+    <Compile Include="Job.cs" />
     <Compile Include="JobShopSchedulingProblem.cs" />
-    <Compile Include="JSSPTask.cs" />
-    <Compile Include="Interfaces\IJSSPOperator.cs" />
     <Compile Include="Evaluators\SchedulingEvaluationAlgorithm.cs" />
+    <Compile Include="Task.cs" />
     <Compile Include="SchedulingProblem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Schedule.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -148 +104 @@
       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SchedulingEncoding\3.3\HeuristicLab.Encodings.SchedulingEncoding-3.3.csproj">
+      <Project>{17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}</Project>
+      <Name>HeuristicLab.Encodings.SchedulingEncoding-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -31 +31 @@
 using HeuristicLab.Data;
 using System.IO;
-using HeuristicLab.Problems.Scheduling.Encodings;
 using HeuristicLab.Problems.Scheduling.Evaluators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Problems.Scheduling.Analyzers;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.Scheduling.Interfaces;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.JobSequenceMatrix;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.PriorityRulesVector;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.PermutationWithRepetition;
+using HeuristicLab.Encodings.SchedulingEncoding;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding.JobSequenceMatrix;
+using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Encodings.SchedulingEncoding.PriorityRulesVector;
+using HeuristicLab.Encodings.SchedulingEncoding.PermutationWithRepetition;
+using HeuristicLab.Problems.Scheduling.Decoders;
 
 namespace HeuristicLab.Problems.Scheduling {
@@ -64 +63 @@
 
     #region Parameter Properties
-    public ValueParameter<ItemList<JSSPJob>> JobsParameter {
-      get { return (ValueParameter<ItemList<JSSPJob>>)Parameters["Jobs"]; }
+    public ValueParameter<ItemList<Job>> JobDataParameter {
+      get { return (ValueParameter<ItemList<Job>>)Parameters["JobData"]; }
     }
     public ValueParameter<SchedulingEvaluatorType> EvaluatorTypeParameter {
@@ -74 +73 @@
     }
 
+    public ValueParameter<IntValue> JobsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["Jobs"]; }
+    }
+    public ValueParameter<IntValue> ResourcesParameter {
+      get { return (ValueParameter<IntValue>)Parameters["Resources"]; }
+    }
+
     #endregion
 
     #region Properties
-    public ItemList<JSSPJob> Jobs {
-      get { return JobsParameter.Value; }
-      set { JobsParameter.Value = value; }
+    public ItemList<Job> JobData {
+      get { return JobDataParameter.Value; }
+      set { JobDataParameter.Value = value; }
     }
     public SchedulingEvaluatorType EvaluatorType {
@@ -89 +95 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
+    public IntValue Jobs {
+      get { return JobsParameter.Value; }
+      set { JobsParameter.Value = value; }
+    }
+    public IntValue Resources {
+      get { return ResourcesParameter.Value; }
+      set { ResourcesParameter.Value = value; }
+    }
     #endregion
 
     [Storable]
-    private JSSPEncodingTypes encodingType;
+    private SchedulingEncodingTypes encodingType;
 
     public JobShopSchedulingProblem()
       : base(new SchedulingEvaluationAlgorithm (), new JSMRandomCreator ()) {
-      Parameters.Add(new ValueParameter<ItemList<JSSPJob>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance.", new ItemList<JSSPJob>()));
-      Parameters.Add(new ValueParameter<SchedulingEvaluatorType>("EvaluatorType", "Type of the evaluator used to determine the quality of an individual.", new SchedulingEvaluatorType (SchedulingEvaluatorTypes.MakespanEvaluator)));
-      Parameters.Add(new OptionalValueParameter<Schedule>("BestKnownSolution", "The best known solution of this JSSP instance.")); 
-        encodingType = JSSPEncodingTypes.JSMEncoding;
+      Parameters.Add(new ValueParameter<ItemList<Job>>("JobData", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance.", new ItemList<Job>()));
+      Parameters.Add(new ValueParameter<SchedulingEvaluatorType>("EvaluatorType", "Type of the evaluator used to determine the quality of an individual.", new SchedulingEvaluatorType(SchedulingEvaluatorTypes.MakespanEvaluator)));
+      Parameters.Add(new OptionalValueParameter<Schedule>("BestKnownSolution", "The best known solution of this JSSP instance."));
+      
+      Parameters.Add(new ValueParameter<IntValue>("Jobs", "The number of jobs used in this JSSP instance.", new IntValue ()));
+      Parameters.Add(new ValueParameter<IntValue>("Resources", "The number of resources used this JSSP instance.", new IntValue()));
+      encodingType = SchedulingEncodingTypes.JSMEncoding;
         InitializeOperators();
         AttachEventHandlers();
@@ -108 +125 @@
     protected override void OnSolutionCreatorChanged() {
       if (SolutionCreator.GetType().Equals(typeof(JSMRandomCreator)))
-        encodingType = JSSPEncodingTypes.JSMEncoding;
+        encodingType = SchedulingEncodingTypes.JSMEncoding;
       else {
         if (SolutionCreator.GetType().Equals(typeof(PRVRandomCreator)))
-          encodingType = JSSPEncodingTypes.PRVEncoding;
+          encodingType = SchedulingEncodingTypes.PRVEncoding;
         else
-          encodingType = JSSPEncodingTypes.PWREncoding;
+          encodingType = SchedulingEncodingTypes.PWREncoding;
       }
       InitializeOperators();
@@ -130 +147 @@
     private void ApplyEncoding() {
       if (EvaluatorType.Value == SchedulingEvaluatorTypes.MakespanEvaluator) {
-        if (encodingType == JSSPEncodingTypes.JSMEncoding) {
+        if (encodingType == SchedulingEncodingTypes.JSMEncoding) {
           Operators.AddRange(ApplicationManager.Manager.GetInstances<IJSMOperator>());
           ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<JSMEncoding>(new JSMDecoder(), new MakespanEvaluator());
         } else {
-          if (encodingType == JSSPEncodingTypes.PRVEncoding) {
+          if (encodingType == SchedulingEncodingTypes.PRVEncoding) {
             Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
             ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PRVEncoding>(new PRVDecoder(), new MakespanEvaluator());
           } else {
-            if (encodingType == JSSPEncodingTypes.PWREncoding) {
+            if (encodingType == SchedulingEncodingTypes.PWREncoding) {
               Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
               ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PWREncoding>(new PWRDecoder(), new MakespanEvaluator());
@@ -145 +162 @@
         }
       } else {
-        if (encodingType == JSSPEncodingTypes.JSMEncoding) {
+        if (encodingType == SchedulingEncodingTypes.JSMEncoding) {
           Operators.AddRange(ApplicationManager.Manager.GetInstances<IJSMOperator>());
           ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<JSMEncoding>(new JSMDecoder(), new MeanTardinessEvaluator());
         } else {
-          if (encodingType == JSSPEncodingTypes.PRVEncoding) {
+          if (encodingType == SchedulingEncodingTypes.PRVEncoding) {
             Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
             ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PRVEncoding>(new PRVDecoder(), new MeanTardinessEvaluator());
           } else {
-            if (encodingType == JSSPEncodingTypes.PWREncoding) {
+            if (encodingType == SchedulingEncodingTypes.PWREncoding) {
               Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
               ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PWREncoding>(new PWRDecoder(), new MeanTardinessEvaluator());
@@ -203 +220 @@
       bool problemFound = false;
 
-      Jobs = new ItemList<JSSPJob>();
+      JobData = new ItemList<Job>();
 
       while (!problemFile.EndOfStream && !problemFound) {
@@ -210 +227 @@
         if (data.Count > 0 && ((int)data[0][0] >= 48 && (int)data[0][0] <= 57)) {
           int jobCount = 0;
-          //data[0] = nrOfJobs (int)
-          //data[1] = nrOfResources (int)
+          Jobs = new IntValue (Int32.Parse(data[0]));
+          Resources = new IntValue (Int32.Parse(data[1]));
           //data[2] = bestKnownQuality (double)
           //data[3] = dueDates (0|1)
@@ -228 +245 @@
               dataCount--;
             }
-            JSSPJob j = new JSSPJob(new IntValue(jobCount), dueDate);
+            Job j = new Job(new IntValue(jobCount), dueDate);
             for (int i = 0; i < dataCount; i++) {
-              JSSPTask t = new JSSPTask(new IntValue (i / 2), new IntValue(Int32.Parse(data[i])), new DoubleValue(Double.Parse(data[i + 1])), new IntValue (jobCount));
-              if (j.Tasks.Count > 0) {
-                t.StartTime = new DoubleValue (j.Tasks[j.Tasks.Count - 1].EndTime.Value + 2);
-              }
+              Task t = new Task(i / 2, Int32.Parse(data[i]), jobCount, Double.Parse(data[i + 1]));
               j.Tasks.Add(t);
               i++;
             }//for
-            this.Jobs.Add(j);
+            this.JobData.Add(j);
             jobCount++;
             line = problemFile.ReadLine();
@@ -277 +291 @@
 
       JSMDecoder decoder = new JSMDecoder();
-      Schedule result = decoder.CreateScheduleFromEncoding(solution, Jobs);
+      Schedule result = decoder.CreateScheduleFromEncoding(solution, JobData);
       BestKnownSolution = result;
     }

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/SchedulingProblem.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
-using HeuristicLab.Problems.Scheduling.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
 
 namespace HeuristicLab.Problems.Scheduling {