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

Timestamp:

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

Author:

jhelm

Message:

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

Location:

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3

Files:

• HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj (modified) (4 diffs)
• Interfaces/IDirectScheduleOperator.cs (added)
• JobSequenceMatrix/JSMRandomCreator.cs (modified) (1 diff)
• PermutationWithRepetition/Crossovers/PWRPPXCrossover.cs (modified) (1 diff)
• PermutationWithRepetition/Manipulators/PWRInsertionManipulator.cs (added)
• PermutationWithRepetition/Manipulators/PWRUniformOnePositionManipulator.cs (deleted)
• PermutationWithRepetition/PWREncoding.cs (modified) (1 diff)
• PermutationWithRepetition/PWRRandomCreator.cs (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• PriorityRulesVector/PRVRandomCreator.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• ScheduleEncoding/Crossovers (added)
• ScheduleEncoding/Crossovers/DirectScheduleCrossover.cs (added)
• ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.cs (added)
• ScheduleEncoding/DirectScheduleRandomCreator.cs (added)
• ScheduleEncoding/GTAlgorithmUtils.cs (added)
• ScheduleEncoding/Job.cs (added)
• ScheduleEncoding/Manipulators (added)
• ScheduleEncoding/Manipulators/ConcreteScheduleManipulator.cs (added)
• ScheduleEncoding/Manipulators/DirectScheduleManipulator.cs (added)
• ScheduleEncoding/Resource.cs (modified) (1 diff)
• ScheduleEncoding/Schedule.cs (modified) (3 diffs)
• ScheduleEncoding/ScheduledTask.cs (modified) (1 diff)
• ScheduleEncoding/Task.cs (added)

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

@@ -47 +47 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interfaces\IDirectScheduleOperator.cs" />
     <Compile Include="Interfaces\IScheduleEvaluationAlgorithm.cs" />
     <Compile Include="Interfaces\IJSMOperator.cs" />
@@ -71 +72 @@
     <Compile Include="PermutationWithRepetition\Crossovers\PWRPPXCrossover.cs" />
     <Compile Include="PermutationWithRepetition\Manipulators\PWRManipulator.cs" />
-    <Compile Include="PermutationWithRepetition\Manipulators\PWRUniformOnePositionManipulator.cs" />
+    <Compile Include="PermutationWithRepetition\Manipulators\PWRInsertionManipulator.cs" />
     <Compile Include="PermutationWithRepetition\PWREncoding.cs" />
     <Compile Include="PermutationWithRepetition\PWRRandomCreator.cs" />
@@ -83 +84 @@
     <Compile Include="PriorityRulesVector\PRVRandomCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.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="ScheduleEncoding\Manipulators\DirectScheduleManipulator.cs" />
+    <Compile Include="ScheduleEncoding\Manipulators\ConcreteScheduleManipulator.cs" />
+    <Compile Include="ScheduleEncoding\DirectScheduleRandomCreator.cs" />
     <Compile Include="ScheduleEncoding\Resource.cs" />
     <Compile Include="ScheduleEncoding\Schedule.cs" />
@@ -89 +97 @@
     <Compile Include="ScheduleCrossover.cs" />
     <Compile Include="ScheduleDecoder.cs" />
+    <Compile Include="ScheduleEncoding\Task.cs" />
     <Compile Include="ScheduleManipulator.cs" />
   </ItemGroup>

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

@@ -64 +64 @@
 
 
-    protected override JSMEncoding CreateSolution() {
+    public static JSMEncoding Apply(int jobs, int resources, IRandom random) {
       JSMEncoding solution = new JSMEncoding();
-      IntValue nrOfJobs = new IntValue(JobsParameter.ActualValue.Value);
-      IntValue nrOfResources = new IntValue(ResourcesParameter.ActualValue.Value);
 
-      for (int i = 0; i < nrOfResources.Value; i++) {
-        solution.JobSequenceMatrix.Add(new Permutation(PermutationTypes.Absolute, nrOfJobs.Value, RandomParameter.ActualValue));
+      for (int i = 0; i < resources; i++) {
+        solution.JobSequenceMatrix.Add(new Permutation(PermutationTypes.Absolute, jobs, random));
       }
 
       return solution;
     }
+
+
+    protected override JSMEncoding CreateSolution() {
+      return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue);
+    }
   }
 }

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);
     }
   }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.3.6412")]
+  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.3.6414")]
   [PluginFile("HeuristicLab.Encodings.ScheduleEncoding-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabEncodingsScheduleEncodingPlugin : PluginBase {

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

@@ -64 +64 @@
     }
 
+    public static PRVEncoding Apply(int jobs, int resources, IRandom random, IntValue nrOfRules) {
+      return new PRVEncoding(jobs * resources, random, 0, nrOfRules.Value, nrOfRules);
+    }
 
     protected override PRVEncoding CreateSolution() {
-      IntValue nrOfJobs = new IntValue(JobsParameter.ActualValue.Value);
-      IntValue nrOfResources = new IntValue(ResourcesParameter.ActualValue.Value);
-      PRVEncoding solution = new PRVEncoding(nrOfJobs.Value * nrOfResources.Value, RandomParameter.ActualValue, 0, NrOfRules.Value, NrOfRules);
-      return solution;
+      return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue, NrOfRules);
     }
+
+
   }
 }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.3.6412")]
+[assembly: AssemblyFileVersion("3.3.3.6414")]

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs

@@ -75 +75 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(Resource))
+        return AreEqual(this, obj as Resource);
+      else
+        return false;
+    }
+
+    private static bool AreEqual(Resource res1, Resource res2) {
+      if (res1.Tasks.Count != res2.Tasks.Count)
+        return false;
+      for (int i = 0; i < res1.Tasks.Count; i++) {
+        if (!res1.Tasks[i].Equals(res2.Tasks[i]))
+          return false;
+      }
+
+      return true;
+    }
   }
 }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

@@ -31 +31 @@
   [Item("Schedule", "Represents the general solution for scheduling problems.")]
   [StorableClass]
-  public class Schedule : NamedItem {
+  public class Schedule : NamedItem, IScheduleEncoding {
     #region Properties
     [Storable]
@@ -79 +79 @@
       lastScheduledTaskOfJob = new Dictionary<int, ScheduledTask>();
     }
+
 
 
@@ -159 +160 @@
       return quality;
     }
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(Schedule))
+        return AreEqual(this, obj as Schedule);
+      else
+        return false;
+    }
+
+    private static bool AreEqual(Schedule schedule1, Schedule schedule2) {
+      if (schedule1.Resources.Count != schedule2.Resources.Count)
+        return false;
+      for (int i = 0; i < schedule1.Resources.Count; i++) {
+        if (!schedule1.Resources[i].Equals(schedule2.Resources[i]))
+          return false;
+      }
+
+      return true;
+    }
+
   }
 }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs

@@ -71 +71 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(ScheduledTask))
+        return AreEqual(this, obj as ScheduledTask);
+      else
+        return false;
+    }
+
+    public static bool AreEqual(ScheduledTask task1, ScheduledTask task2) {
+      return (task1.Duration == task2.Duration &&
+        task1.JobNr == task2.JobNr &&
+        task1.ResourceNr == task2.ResourceNr &&
+        task1.StartTime == task2.StartTime &&
+        task1.EndTime == task2.EndTime);
+    }
   }
 }