Changeset 13437 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding

Timestamp:

12/06/15 15:33:25 (9 years ago)

Author:

mkommend

Message:

#2521: Added encodings for schedules.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3

Files:

• GTAlgorithmUtils.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/GTAlgorithmUtils.cs) (4 diffs)
• HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj (modified) (5 diffs)
• Interfaces/IDirectScheduleOperator.cs (modified) (1 diff)
• Interfaces/ISchedule.cs (modified) (1 diff)
• Interfaces/IScheduleCreator.cs (modified) (1 diff)
• Interfaces/IScheduleEncoding.cs (added)
• Job.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Job.cs)
• JobSequenceMatrix/Crossovers/JSMCrossover.cs (modified) (2 diffs)
• JobSequenceMatrix/Crossovers/JSMJOXCrossover.cs (modified) (1 diff)
• JobSequenceMatrix/Crossovers/JSMOXCrossover.cs (modified) (1 diff)
• JobSequenceMatrix/Crossovers/JSMSXXCrossover.cs (modified) (1 diff)
• JobSequenceMatrix/JSMEncoding.cs (modified) (2 diffs)
• JobSequenceMatrix/JSMRandomCreator.cs (modified) (4 diffs)
• JobSequenceMatrix/JobSequenceMatrixEncoding.cs (added)
• JobSequenceMatrix/Manipulators/JSMManipulator.cs (modified) (2 diffs)
• JobSequenceMatrix/Manipulators/JSMShiftChangeManipulator.cs (modified) (1 diff)
• JobSequenceMatrix/Manipulators/JSMSwapManipulator.cs (modified) (1 diff)
• PermutationWithRepetition/Crossovers/PWRCrossover.cs (modified) (1 diff)
• PermutationWithRepetition/Crossovers/PWRGOXCrossover.cs (modified) (1 diff)
• PermutationWithRepetition/Crossovers/PWRPPXCrossover.cs (modified) (1 diff)
• PermutationWithRepetition/Manipulators/PWRInsertionManipulator.cs (modified) (2 diffs)
• PermutationWithRepetition/Manipulators/PWRManipulator.cs (modified) (2 diffs)
• PermutationWithRepetition/PWREncoding.cs (modified) (1 diff)
• PermutationWithRepetition/PWRRandomCreator.cs (modified) (3 diffs)
• PermutationWithRepetition/PermutationWithRepetitionEncoding.cs (added)
• PriorityRulesVector/Crossovers/PRVCrossover.cs (modified) (2 diffs)
• PriorityRulesVector/Crossovers/PRVDiscreteCrossover.cs (modified) (1 diff)
• PriorityRulesVector/Crossovers/PRVSinglePointCrossover.cs (modified) (1 diff)
• PriorityRulesVector/Manipulators/PRVManipulator.cs (modified) (2 diffs)
• PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs (modified) (2 diffs)
• PriorityRulesVector/PRVEncoding.cs (modified) (3 diffs)
• PriorityRulesVector/PRVRandomCreator.cs (modified) (4 diffs)
• PriorityRulesVector/PriorityRulesVectorEncoding.cs (added)
• ScheduleCreator.cs (modified) (3 diffs)
• ScheduleEncoding.cs (added)
• ScheduleEncoding/Crossovers/DirectScheduleCrossover.cs (modified) (2 diffs)
• ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.cs (modified) (3 diffs)
• ScheduleEncoding/DirectScheduleEncoding.cs (added)
• ScheduleEncoding/DirectScheduleRandomCreator.cs (modified) (4 diffs)
• ScheduleEncoding/Manipulators/DirectScheduleManipulator.cs (modified) (3 diffs)
• Task.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Task.cs)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/GTAlgorithmUtils.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Core;
 
@@ -26 +27 @@
   public static class GTAlgorithmUtils {
 
-    public static ItemList<Task> GetEarliestNotScheduledTasks(ItemList<Job> jobData) {
+    public static ItemList<Task> GetEarliestNotScheduledTasks(IEnumerable<Job> jobData) {
       ItemList<Task> result = new ItemList<Task>();
       foreach (Job j in jobData) {
@@ -38 +39 @@
       return result;
     }
-    public static Task GetTaskWithMinimalEC(ItemList<Task> earliestTasksList, Schedule schedule) {
+    public static Task GetTaskWithMinimalEC(IEnumerable<Task> earliestTasksList, Schedule schedule) {
       double minEct = double.MaxValue;
       Task result = null;
@@ -50 +51 @@
       return result;
     }
-    public static ItemList<Task> GetConflictSetForTask(Task conflictedTask, ItemList<Task> earliestTasksList, ItemList<Job> jobData, Schedule schedule) {
+    public static ItemList<Task> GetConflictSetForTask(Task conflictedTask, IEnumerable<Task> earliestTasksList, Schedule schedule) {
       ItemList<Task> result = new ItemList<Task>();
       double conflictedCompletionTime = ComputeEarliestCompletionTime(conflictedTask, schedule);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj

@@ -123 +123 @@
     <Compile Include="Interfaces\IScheduleCrossover.cs" />
     <Compile Include="Interfaces\ISchedule.cs" />
+    <Compile Include="Interfaces\IScheduleEncoding.cs" />
     <Compile Include="Interfaces\IScheduleManipulator.cs" />
     <Compile Include="Interfaces\IScheduleOperator.cs" />
@@ -129 +130 @@
     <Compile Include="JobSequenceMatrix\Crossovers\JSMOXCrossover.cs" />
     <Compile Include="JobSequenceMatrix\Crossovers\JSMSXXCrossover.cs" />
+    <Compile Include="JobSequenceMatrix\JobSequenceMatrixEncoding.cs" />
     <Compile Include="JobSequenceMatrix\JSMEncoding.cs" />
     <Compile Include="JobSequenceMatrix\JSMRandomCreator.cs" />
@@ -139 +141 @@
     <Compile Include="PermutationWithRepetition\Manipulators\PWRManipulator.cs" />
     <Compile Include="PermutationWithRepetition\Manipulators\PWRInsertionManipulator.cs" />
+    <Compile Include="PermutationWithRepetition\PermutationWithRepetitionEncoding.cs" />
     <Compile Include="PermutationWithRepetition\PWREncoding.cs" />
     <Compile Include="PermutationWithRepetition\PWRRandomCreator.cs" />
@@ -147 +150 @@
     <Compile Include="PriorityRulesVector\Manipulators\PRVManipulator.cs" />
     <Compile Include="PriorityRulesVector\Manipulators\PRVUniformOnePositionManipulator.cs" />
+    <Compile Include="PriorityRulesVector\PriorityRulesVectorEncoding.cs" />
     <Compile Include="PriorityRulesVector\PRVEncoding.cs" />
     <Compile Include="PriorityRulesVector\PRVRandomCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScheduleEncoding.cs" />
     <Compile Include="ScheduleEncoding\Crossovers\DirectScheduleCrossover.cs" />
     <Compile Include="ScheduleEncoding\Crossovers\DirectScheduleGTCrossover.cs" />
-    <Compile Include="ScheduleEncoding\GTAlgorithmUtils.cs" />
-    <Compile Include="ScheduleEncoding\Job.cs" />
+    <Compile Include="GTAlgorithmUtils.cs" />
+    <Compile Include="Job.cs" />
+    <Compile Include="ScheduleEncoding\DirectScheduleEncoding.cs" />
     <Compile Include="ScheduleEncoding\Manipulators\DirectScheduleManipulator.cs" />
     <Compile Include="ScheduleEncoding\DirectScheduleRandomCreator.cs" />
@@ -161 +167 @@
     <Compile Include="ScheduleCreator.cs" />
     <Compile Include="ScheduleCrossover.cs" />
-    <Compile Include="ScheduleEncoding\Task.cs" />
+    <Compile Include="Task.cs" />
     <Compile Include="ScheduleManipulator.cs" />
   </ItemGroup>

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/Interfaces/IDirectScheduleOperator.cs

@@ -24 +24 @@
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   public interface IDirectScheduleOperator : IOperator {
+    ILookupParameter<ItemList<Job>> JobDataParameter { get; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/Interfaces/ISchedule.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  public interface ISchedule : IItem {
+  public interface ISchedule : ISolution {
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/Interfaces/IScheduleCreator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  public interface IScheduleCreator : ISolutionCreator, IScheduleOperator {
+  public interface IScheduleCreator : ISolutionCreator<ISchedule>, IScheduleOperator {
     ILookupParameter<ISchedule> ScheduleParameter { get; }
+    IValueLookupParameter<IntValue> JobsParameter { get; }
+    IValueLookupParameter<IntValue> ResourcesParameter { get; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMCrossover", "An operator which crosses two JSM representations.")]
   [StorableClass]
@@ -32 +32 @@
     protected JSMCrossover(bool deserializing) : base(deserializing) { }
     protected JSMCrossover(JSMCrossover original, Cloner cloner) : base(original, cloner) { }
-    public JSMCrossover()
-      : base() {
-      ParentsParameter.ActualName = "JobSequenceMatrix";
-      ChildParameter.ActualName = "JobSequenceMatrix";
-    }
+
+    public JSMCrossover() : base() { }
 
     public abstract JSMEncoding Cross(IRandom random, JSMEncoding parent1, JSMEncoding parent2);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMJOXCrossover.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMJobbasedOrderCrossover", "Represents a crossover operation swapping subsequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMOXCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMOrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMSXXCrossover.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMSubsequenceExchangeCrossover", "Represents a crossover operation identifiying and exchanging equal subsequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMEncoding.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Text;
 using HeuristicLab.Common;
@@ -27 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JobSequenceMatrixEncoding", "Represents an encoding for a scheduling Problem using a list of job sequences to deliver scheduleinformation.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
@@ -28 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JobSequenceMatrixCreator", "Creator class used to create Job Sequence Matrix solutions for standard JobShop scheduling problems.")]
   [StorableClass]
@@ -35 +34 @@
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    public IValueLookupParameter<IntValue> JobsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Jobs"]; }
-    }
-    public IValueLookupParameter<IntValue> ResourcesParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
     }
 
@@ -49 +42 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Jobs", "The number of jobs handled in this problem instance."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Resources", "The number of resources used in this problem instance."));
-
-      ScheduleParameter.ActualName = "JobSequenceMatrix";
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMManipulator", "An operator which manipulates a JSM representation.")]
   [StorableClass]
@@ -32 +32 @@
     protected JSMManipulator(bool deserializing) : base(deserializing) { }
     protected JSMManipulator(JSMManipulator original, Cloner cloner) : base(original, cloner) { }
-    public JSMManipulator()
-      : base() {
-      ScheduleParameter.ActualName = "JobSequenceMatrix";
-    }
+    public JSMManipulator() : base() { }
 
     protected abstract void Manipulate(IRandom random, ISchedule individual);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMShiftChangeManipulator.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMShiftChangeManipulator", "Represents a manipulation operation where the operations of a randomly determined job are shifted in one direction for all resources.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMSwapManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMSwapManipulator", "Represents a manipulation operation swapping parts of the individual.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PWRCrossover", "An operator which crosses two JSM representations.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRGOXCrossover.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PWRGeneralizationOrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRPPXCrossover.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PWRPPXCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRInsertionManipulator.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PWRInsertionManipulator", "Represents a manipulation operation inserting parts of the individual at another position.")]
   [StorableClass]
@@ -43 +43 @@
       int cutIndex = random.Next(individual.PermutationWithRepetition.Length);
       int insertIndex = random.Next(individual.PermutationWithRepetition.Length);
-      List<int> perm = ((IntegerVector)(individual.PermutationWithRepetition.Clone())).ToList<int>();
+      List<int> perm = ((IntegerVector)(individual.PermutationWithRepetition.Clone())).ToList();
       int aux = perm[cutIndex];
       if (cutIndex > insertIndex) {

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PWRManipulator", "An operator which manipulates a PWR representation.")]
   [StorableClass]
@@ -33 +33 @@
     protected PWRManipulator(bool deserializing) : base(deserializing) { }
     protected PWRManipulator(PWRManipulator original, Cloner cloner) : base(original, cloner) { }
-    public PWRManipulator()
-      : base() {
-      ScheduleParameter.ActualName = "PermutationWithRepetition";
-    }
+    public PWRManipulator() : base() { }
 
     protected abstract void Manipulate(IRandom random, PWREncoding individual);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWREncoding.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PermutationWithRepetitionEncoding", "Represents a encoding for a standard JobShop Scheduling Problem.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWRRandomCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PermutationWithRepetitionRandomCreator", "Creates PWR-individuals at random.")]
   [StorableClass]
@@ -34 +33 @@
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    public IValueLookupParameter<IntValue> JobsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Jobs"]; }
-    }
-    public IValueLookupParameter<IntValue> ResourcesParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
     }
 
@@ -48 +41 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Jobs", "The number of jobs handled in this problem instance."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Resources", "The number of resources used in this problem instance."));
-
-      ScheduleParameter.ActualName = "PermutationWithRepetition";
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PRVCrossover", "An operator which crosses two PRV representations.")]
   [StorableClass]
@@ -32 +32 @@
     protected PRVCrossover(bool deserializing) : base(deserializing) { }
     protected PRVCrossover(PRVCrossover original, Cloner cloner) : base(original, cloner) { }
-    public PRVCrossover()
-      : base() {
-      ParentsParameter.ActualName = "PriorityRulesVector";
-      ChildParameter.ActualName = "PriorityRulesVector";
-    }
+    public PRVCrossover() : base() { }
 
     public abstract PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVDiscreteCrossover.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PRVDiscreteCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVSinglePointCrossover.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PRVSinglePointCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PRVManipulator", "An operator which manipulates a PRV representation.")]
   [StorableClass]
@@ -32 +32 @@
     protected PRVManipulator(bool deserializing) : base(deserializing) { }
     protected PRVManipulator(PRVManipulator original, Cloner cloner) : base(original, cloner) { }
-    public PRVManipulator()
-      : base() {
-      ScheduleParameter.ActualName = "PriorityRulesVector";
-    }
+    public PRVManipulator() : base() { }
 
     protected abstract void Manipulate(IRandom random, PRVEncoding individual);

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PRVUniformOnePositionManipulator", "Represents a manipulation operation inserting parts of the individual at another position.")]
   [StorableClass]
@@ -41 +41 @@
 
     public static void Apply(IRandom random, PRVEncoding individual) {
-      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, individual.NrOfRules.Value } }));
+      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, individual.NrOfRules } }));
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVEncoding.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PriorityRulesVectorEncoding", "Represents an encoding for a Scheduling Problem.")]
   [StorableClass]
@@ -35 +34 @@
 
     [Storable]
-    private IntValue nrOfRules;
-    public IntValue NrOfRules {
-      get {
-        return nrOfRules;
-      }
-    }
+    public int NrOfRules { get; private set; }
 
     [StorableConstructor]
@@ -46 +40 @@
     protected PRVEncoding(PRVEncoding original, Cloner cloner)
       : base(original, cloner) {
-      this.nrOfRules = cloner.Clone(original.NrOfRules);
+      this.NrOfRules = original.NrOfRules;
       this.PriorityRulesVector = cloner.Clone(original.PriorityRulesVector);
     }
     public PRVEncoding(int nrOfRules)
       : base() {
-      this.nrOfRules = new IntValue(nrOfRules);
+      this.NrOfRules = nrOfRules;
       this.PriorityRulesVector = new IntegerVector();
     }
-    public PRVEncoding(IntegerVector iv, IntValue nrOfRules)
+    public PRVEncoding(IntegerVector iv, int nrOfRules)
       : base() {
-      this.nrOfRules = (IntValue)nrOfRules.Clone();
+      this.NrOfRules = nrOfRules;
       this.PriorityRulesVector = (IntegerVector)iv.Clone();
     }
-    public PRVEncoding(int length, IRandom random, int min, int max, IntValue nrOfRules)
+    public PRVEncoding(int length, IRandom random, int min, int max, int nrOfRules)
       : base() {
-      this.nrOfRules = (IntValue)nrOfRules.Clone();
+      this.NrOfRules = nrOfRules;
       this.PriorityRulesVector = new IntegerVector(length, random, min, max);
     }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PriorityRulesRandomCreator", "Creator class used to create PRV encoding objects for scheduling problems.")]
   [StorableClass]
@@ -33 +32 @@
 
     [Storable]
-    public IntValue NrOfRules { get; set; }
+    public int NrOfRules { get; set; }
 
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    public IValueLookupParameter<IntValue> JobsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Jobs"]; }
-    }
-    public IValueLookupParameter<IntValue> ResourcesParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
     }
 
@@ -49 +42 @@
     protected PRVRandomCreator(PRVRandomCreator original, Cloner cloner)
       : base(original, cloner) {
-      this.NrOfRules = cloner.Clone(original.NrOfRules);
+      this.NrOfRules = original.NrOfRules;
     }
-    public PRVRandomCreator()
-      : base() {
-      NrOfRules = new IntValue(10);
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Jobs", "The number of jobs handled in this problem instance."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Resources", "The number of resources used in this problem instance."));
-      ScheduleParameter.ActualName = "PriorityRulesVector";
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PRVRandomCreator(this, cloner);
     }
 
-    public static PRVEncoding Apply(int jobs, int resources, IRandom random, IntValue nrOfRules) {
-      return new PRVEncoding(jobs * resources, random, 0, nrOfRules.Value, nrOfRules);
+    public PRVRandomCreator()
+      : base() {
+      NrOfRules = 10;
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
+    }
+
+    public static PRVEncoding Apply(int jobs, int resources, IRandom random, int nrOfRules) {
+      return new PRVEncoding(jobs * resources, random, 0, nrOfRules, nrOfRules);
     }
 
@@ -71 +61 @@
       return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue, NrOfRules);
     }
-
-
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
@@ -34 +35 @@
       get { return (ILookupParameter<ISchedule>)Parameters["Schedule"]; }
     }
+    public IValueLookupParameter<IntValue> JobsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["Jobs"]; }
+    }
+    public IValueLookupParameter<IntValue> ResourcesParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
+    }
 
     [StorableConstructor]
@@ -40 +47 @@
     public ScheduleCreator()
       : base() {
-      Parameters.Add(new LookupParameter<ISchedule>("Schedule", "The new scheduling solutioncandidate."));
+      Parameters.Add(new LookupParameter<ISchedule>("Schedule", "The new scheduling solution candidate."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Jobs", "The number of jobs handled in this problem instance."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Resources", "The number of resources used in this problem instance."));
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleCrossover.cs

@@ -29 +29 @@
   [StorableClass]
   public abstract class DirectScheduleCrossover : ScheduleCrossover, IDirectScheduleOperator {
+    public ILookupParameter<ItemList<Job>> JobDataParameter {
+      get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
+    }
+
     [StorableConstructor]
     protected DirectScheduleCrossover(bool deserializing) : base(deserializing) { }
@@ -34 +38 @@
     public DirectScheduleCrossover()
       : base() {
-      ParentsParameter.ActualName = "Schedule";
-      ChildParameter.ActualName = "Schedule";
       Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the JSSP - Instance."));
-    }
-
-    public ILookupParameter<ItemList<Job>> JobDataParameter {
-      get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.cs

@@ -64 +64 @@
         Task minimal = GTAlgorithmUtils.GetTaskWithMinimalEC(earliestTasksList, child);
         int conflictedResourceNr = minimal.ResourceNr;
-        Resource conflictedResource = child.Resources[conflictedResourceNr];
 
         //STEP 2 - Compute a conflict set of all operations that can be scheduled on the conflicted resource
-        ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, jobData, child);
+        ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, child);
 
         //STEP 3 - Select a task from the conflict set
-        int progressOnResource = conflictedResource.Tasks.Count;
         Task selectedTask = null;
         if (random.NextDouble() < mutProp) {
@@ -77 +75 @@
         } else {
           //Crossover
-          selectedTask = SelectTaskFromConflictSet(conflictSet, ((random.Next(2) == 0) ? parent1 : parent2), conflictedResourceNr, progressOnResource);
+          selectedTask = SelectTaskFromConflictSet(conflictSet, ((random.Next(2) == 0) ? parent1 : parent2), conflictedResourceNr);
         }
 
@@ -92 +90 @@
     }
 
-    private static Task SelectTaskFromConflictSet(ItemList<Task> conflictSet, Schedule usedParent, int conflictedResourceNr, int progressOnResource) {
+    private static Task SelectTaskFromConflictSet(ItemList<Task> conflictSet, Schedule usedParent, int conflictedResourceNr) {
       //Apply Crossover
       foreach (ScheduledTask st in usedParent.Resources[conflictedResourceNr].Tasks) {

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleRandomCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -33 +31 @@
   [Item("DirectScheduleRandomCreator", "Creator class used to create schedule encoding objects.")]
   [StorableClass]
-  public class DirectScheduleRandomCreator : ScheduleCreator, IStochasticOperator {
+  public class DirectScheduleRandomCreator : ScheduleCreator, IStochasticOperator, IDirectScheduleOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public IValueLookupParameter<IntValue> JobsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Jobs"]; }
-    }
-    public IValueLookupParameter<IntValue> ResourcesParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
-    }
     public ILookupParameter<ItemList<Job>> JobDataParameter {
       get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
     }
-
 
     [StorableConstructor]
@@ -60 +51 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Jobs", "The number of jobs handled in this problem instance."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Resources", "The number of resources used in this problem instance."));
       Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the JSSP - Instance."));
-      ScheduleParameter.ActualName = "Schedule";
     }
 
@@ -89 +77 @@
           new PWREncoding(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue),
           jobData);
-      } catch {
+      }
+      catch {
         throw new Exception("ScheduleRandomCreator needs JobData parameter from a JSSP-Instance to create Schedule-Instances!");
       }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Manipulators/DirectScheduleManipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +30 @@
   [StorableClass]
   public abstract class DirectScheduleManipulator : ScheduleManipulator, IDirectScheduleOperator {
+    public ILookupParameter<ItemList<Job>> JobDataParameter {
+      get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
+    }
 
     [StorableConstructor]
     protected DirectScheduleManipulator(bool deserializing) : base(deserializing) { }
     protected DirectScheduleManipulator(DirectScheduleManipulator original, Cloner cloner) : base(original, cloner) { }
+
     public DirectScheduleManipulator()
       : base() {
-      ScheduleParameter.ActualName = "Schedule";
+      Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the JSSP - Instance."));
     }
 
@@ -42 +47 @@
     public override IOperation InstrumentedApply() {
       var schedule = ScheduleParameter.ActualValue as Schedule;
-      if (schedule == null) throw new InvalidOperationException("ScheduleEncoding was not found or is not of type Schedule.");
+      if (schedule == null) throw new InvalidOperationException("Schedule was not found or is not of type Schedule.");
       Manipulate(RandomParameter.ActualValue, schedule);
       return base.InstrumentedApply();