Changeset 6475 for branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition

Timestamp:

06/24/11 14:23:19 (14 years ago)

Author:

jhelm

Message:

#1329: Added DirectSchedule-Classes for optimization with the direct-schedule encoding.

Location:

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition

Files:

• Crossovers/PWRPPXCrossover.cs (modified) (1 diff)
• Manipulators/PWRInsertionManipulator.cs (added)
• Manipulators/PWRUniformOnePositionManipulator.cs (deleted)
• PWREncoding.cs (modified) (1 diff)
• PWRRandomCreator.cs (modified) (1 diff)

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
-  [Item("PWROrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
+  [Item("PWRPPXCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
   [StorableClass]
   public class PWRPPXCrossover : PWRCrossover {

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

@@ -48 +48 @@
     }
 
-    public PWREncoding(int problemDimension, IRandom random)
+    public PWREncoding(int nrOfJobs, int nrOfResources, IRandom random)
       : base() {
-      PermutationWithRepetition = new IntegerVector(problemDimension * problemDimension);
-      int[] lookUpTable = new int[problemDimension];
+      PermutationWithRepetition = new IntegerVector(nrOfJobs * nrOfResources);
+      int[] lookUpTable = new int[nrOfJobs];
 
       for (int i = 0; i < PermutationWithRepetition.Length; i++) {
-        int newValue = random.Next(problemDimension);
-        while (lookUpTable[newValue] >= problemDimension)
-          newValue = random.Next(problemDimension);
+        int newValue = random.Next(nrOfJobs);
+        while (lookUpTable[newValue] >= nrOfResources)
+          newValue = random.Next(nrOfJobs);
 
         PermutationWithRepetition[i] = newValue;

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

@@ -63 +63 @@
     }
 
+    public static PWREncoding Apply(int jobs, int resources, IRandom random) {
+      return new PWREncoding(jobs, resources, random);
+    }
+
 
     protected override PWREncoding CreateSolution() {
-      PWREncoding result = new PWREncoding(JobsParameter.ActualValue.Value, Random);
-      return result;
+      return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, Random);
     }
   }