Changeset 13443 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix

Timestamp:

12/08/15 14:31:05 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted decoders for SchedulingProblem.

Location:

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

Files:

• Crossovers/JSMJOXCrossover.cs (modified) (1 diff)
• Crossovers/JSMOXCrossover.cs (modified) (1 diff)
• Crossovers/JSMSXXCrossover.cs (modified) (1 diff)
• Decoder (added)
• Decoder/JSMDecoder.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.cs) (7 diffs)
• Decoder/JSMDecodingErrorPolicy.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecodingErrorPolicy.cs) (2 diffs)
• Decoder/JSMDecodingErrorPolicyTypes.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecodingErrorPolicyTypes.cs) (1 diff)
• Decoder/JSMForcingStrategy.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMForcingStrategy.cs) (2 diffs)
• Decoder/JSMForcingStrategyTypes.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMForcingStrategyTypes.cs) (1 diff)
• JSMEncoding.cs (modified) (2 diffs)
• JSMRandomCreator.cs (modified) (1 diff)
• JobSequenceMatrixEncoding.cs (modified) (2 diffs)

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

@@ -41 +41 @@
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding p1, JSMEncoding p2) {
-      var result = new JSMEncoding();
+      var result = new JSMEncoding(random.Next());
 
       int nrOfResources = p1.JobSequenceMatrix.Count;

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

@@ -39 +39 @@
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding parent1, JSMEncoding parent2) {
-      var result = new JSMEncoding();
+      var result = new JSMEncoding(random.Next());
 
       for (int i = 0; i < parent1.JobSequenceMatrix.Count; i++) {

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

@@ -40 +40 @@
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding parent1, JSMEncoding parent2) {
-      var result = new JSMEncoding();
+      var result = new JSMEncoding(random.Next());
       int subSequenceLength = random.Next(parent1.JobSequenceMatrix[0].Length);
       for (int i = 0; i < parent1.JobSequenceMatrix.Count; i++) {

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecoder.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.ScheduleEncoding;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
-namespace HeuristicLab.Problems.Scheduling {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JobSequenceMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequence Matrix.")]
   [StorableClass]
-  public class JSMDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
+  public class JSMDecoder : ScheduleDecoder {
 
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    public ILookupParameter<ItemList<Job>> JobDataParameter {
-      get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
-    }
     public IValueParameter<JSMDecodingErrorPolicy> DecodingErrorPolicyParameter {
       get { return (IValueParameter<JSMDecodingErrorPolicy>)Parameters["DecodingErrorPolicy"]; }
@@ -66 +59 @@
     public JSMDecoder()
       : base() {
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
-      Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the Schedulingproblem - Instance."));
       Parameters.Add(new ValueParameter<JSMDecodingErrorPolicy>("DecodingErrorPolicy", "Specify the policy that should be used to handle decoding errors.", new JSMDecodingErrorPolicy(JSMDecodingErrorPolicyTypes.RandomPolicy)));
       Parameters.Add(new ValueParameter<JSMForcingStrategy>("ForcingStrategy", "Specifies a forcing strategy.", new JSMForcingStrategy(JSMForcingStrategyTypes.SwapForcing)));
-
-      ScheduleEncodingParameter.ActualName = "JobSequenceMatrix";
     }
 
-    private Task SelectTaskFromConflictSet(int conflictedResourceNr, int progressOnConflictedResource, ItemList<Task> conflictSet, ItemList<Permutation> jsm) {
+    private static Task SelectTaskFromConflictSet(JSMEncoding solution, JSMDecodingErrorPolicyTypes decodingErrorPolicy, JSMForcingStrategyTypes forcingStrategy, int conflictedResourceNr, int progressOnConflictedResource, ItemList<Task> conflictSet, IRandom random) {
       if (conflictSet.Count == 1)
         return conflictSet[0];
+
+      var jsm = solution.JobSequenceMatrix;
 
       //get solutionCandidate from jobSequencingMatrix
@@ -88 +79 @@
 
       //if solutionCandidate wasn't found in conflictSet apply DecodingErrorPolicy and ForcingPolicy
-      Task result = ApplyDecodingErrorPolicy(conflictSet, jsm[conflictedResourceNr], progressOnConflictedResource);
+      Task result = ApplyDecodingErrorPolicy(decodingErrorPolicy, conflictSet, jsm[conflictedResourceNr], progressOnConflictedResource, random);
       int newResolutionIndex = 0;
 
       while (newResolutionIndex < jsm[conflictedResourceNr].Length && jsm[conflictedResourceNr][newResolutionIndex] != result.JobNr)
         newResolutionIndex++;
-      ApplyForcingStrategy(jsm, conflictedResourceNr, newResolutionIndex, progressOnConflictedResource, result.JobNr);
+      ApplyForcingStrategy(forcingStrategy, solution, conflictedResourceNr, newResolutionIndex, progressOnConflictedResource, result.JobNr);
 
       return result;
     }
 
-    private Task ApplyDecodingErrorPolicy(ItemList<Task> conflictSet, Permutation resource, int progress) {
-      if (DecodingErrorPolicy == JSMDecodingErrorPolicyTypes.RandomPolicy) {
+    private static Task ApplyDecodingErrorPolicy(JSMDecodingErrorPolicyTypes decodingErrorPolicy, ItemList<Task> conflictSet, Permutation resource, int progress, IRandom random) {
+      if (decodingErrorPolicy == JSMDecodingErrorPolicyTypes.RandomPolicy) {
         //Random
-        return conflictSet[RandomParameter.ActualValue.Next(conflictSet.Count - 1)];
+        return conflictSet[random.Next(conflictSet.Count - 1)];
       } else {
         //Guided
@@ -112 +103 @@
             return (conflictSet[j]);
         }
-        return conflictSet[RandomParameter.ActualValue.Next(conflictSet.Count - 1)];
+        return conflictSet[random.Next(conflictSet.Count - 1)];
       }
     }
 
-    private void ApplyForcingStrategy(ItemList<Permutation> jsm, int conflictedResource, int newResolutionIndex, int progressOnResource, int newResolution) {
-      if (ForcingStrategy == JSMForcingStrategyTypes.SwapForcing) {
+    private static void ApplyForcingStrategy(JSMForcingStrategyTypes forcingStrategy, JSMEncoding solution, int conflictedResource, int newResolutionIndex, int progressOnResource, int newResolution) {
+      var jsm = solution.JobSequenceMatrix;
+      if (forcingStrategy == JSMForcingStrategyTypes.SwapForcing) {
         //SwapForcing
         jsm[conflictedResource][newResolutionIndex] = jsm[conflictedResource][progressOnResource];
         jsm[conflictedResource][progressOnResource] = newResolution;
-      } else {
+      } else if (forcingStrategy == JSMForcingStrategyTypes.ShiftForcing) {
         //ShiftForcing
         List<int> asList = jsm[conflictedResource].ToList<int>();
@@ -132 +124 @@
         }
         jsm[conflictedResource] = new Permutation(PermutationTypes.Absolute, asList.ToArray<int>());
+      } else {
+        throw new InvalidOperationException(string.Format("JSMDecoder encountered unknown forcing strategy {0}", forcingStrategy));
       }
     }
 
-    public Schedule CreateScheduleFromEncoding(JSMEncoding solution, ItemList<Job> jobData) {
-      ItemList<Permutation> jobSequenceMatrix = solution.JobSequenceMatrix;
+    public override Schedule DecodeSchedule(ISchedule encoding, ItemList<Job> jobData) {
+      var solution = encoding as JSMEncoding;
+      if (solution == null) throw new InvalidOperationException("Encoding is not of type JSMEncoding");
+      return DecodeSchedule(solution, jobData, DecodingErrorPolicy, ForcingStrategy);
+    }
 
+    public static Schedule DecodeSchedule(JSMEncoding solution, ItemList<Job> jobData, JSMDecodingErrorPolicyTypes decodingErrorPolicy, JSMForcingStrategyTypes forcingStrategy) {
+      var random = new FastRandom(solution.RandomSeed);
       var jobs = (ItemList<Job>)jobData.Clone();
       var resultingSchedule = new Schedule(jobs[0].Tasks.Count);
@@ -162 +161 @@
         //STEP 3 - Select a task from the conflict set
         int progressOnResource = conflictedResource.Tasks.Count;
-        Task selectedTask = SelectTaskFromConflictSet(conflictedResourceNr, progressOnResource, conflictSet, jobSequenceMatrix);
+        Task selectedTask = SelectTaskFromConflictSet(solution, decodingErrorPolicy, forcingStrategy, conflictedResourceNr, progressOnResource, conflictSet, random);
 
         //STEP 4 - Add the selected task to the current schedule 
@@ -175 +174 @@
       return resultingSchedule;
     }
-
-    public override Schedule CreateScheduleFromEncoding(ISchedule encoding) {
-      var solution = encoding as JSMEncoding;
-      if (solution == null) throw new InvalidOperationException("Encoding is not of type JSMEncoding");
-      return CreateScheduleFromEncoding(solution, JobDataParameter.ActualValue);
-    }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecodingErrorPolicy.cs

@@ -22 +22 @@
 using System.Drawing;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Scheduling {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMDecodingErrorPolicy", "Represents a policy for handling decoding errors.")]
   [StorableClass]
@@ -32 +33 @@
 
     public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Enum; }
+      get { return VSImageLibrary.Enum; }
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecodingErrorPolicyTypes.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.Scheduling {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   public enum JSMDecodingErrorPolicyTypes {
     RandomPolicy,

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMForcingStrategy.cs

@@ -22 +22 @@
 using System.Drawing;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Scheduling {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JSMForcingStrategy", "Represents a forcing strategy.")]
   [StorableClass]
@@ -32 +33 @@
 
     public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Enum; }
+      get { return VSImageLibrary.Enum; }
     }
 

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMForcingStrategyTypes.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.Scheduling {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   public enum JSMForcingStrategyTypes {
     ShiftForcing,

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

@@ -32 +32 @@
 
     [Storable]
-    public ItemList<Permutation> JobSequenceMatrix { get; set; }
+    public ItemList<Permutation> JobSequenceMatrix { get; private set; }
+    [Storable]
+    public int RandomSeed { get; private set; }
 
     [StorableConstructor]
@@ -39 +41 @@
       : base(original, cloner) {
       this.JobSequenceMatrix = cloner.Clone(original.JobSequenceMatrix);
+      this.RandomSeed = original.RandomSeed;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new JSMEncoding(this, cloner);
     }
-    public JSMEncoding()
+    public JSMEncoding(int randomSeed)
       : base() {
+      RandomSeed = randomSeed;
       JobSequenceMatrix = new ItemList<Permutation>();
     }

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

@@ -49 +49 @@
 
     public static JSMEncoding Apply(int jobs, int resources, IRandom random) {
-      var solution = new JSMEncoding();
+      var solution = new JSMEncoding(random.Next());
       for (int i = 0; i < resources; i++) {
         solution.JobSequenceMatrix.Add(new Permutation(PermutationTypes.Absolute, jobs, random));

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Encodings.Schedule {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [StorableClass]
-  public sealed class JobSequenceMatrixEncoding : ScheduleEncoding {
+  public sealed class JobSequenceMatrixEncoding : ScheduleEncoding<JSMEncoding> {
     [StorableConstructor]
     private JobSequenceMatrixEncoding(bool deserializing) : base(deserializing) { }
@@ -44 +43 @@
       : base() {
       SolutionCreator = new JSMRandomCreator();
+      Decoder = new JSMDecoder();
       DiscoverOperators();
     }