Changeset 13469 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Decoder/PRVDecoder.cs

Timestamp:

12/15/15 15:16:24 (9 years ago)

Author:

mkommend

Message:

#2521: Refactored problem base classes and adapted scheduling encoding, scheduling problem and unit tests.

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Decoder/PRVDecoder.cs (modified) (3 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Decoder/PRVDecoder.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
@@ -31 +29 @@
   [Item("JobSequencingMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
   [StorableClass]
-  public class PRVDecoder : ScheduleDecoder {
+  public class PRVDecoder : ScheduleDecoder<PRVEncoding> {
     #region Priority Rules
     //smallest number of remaining tasks
@@ -189 +187 @@
     }
 
-    public override Schedule DecodeSchedule(ISchedule encoding, ItemList<Job> jobData) {
-      var solution = encoding as PRVEncoding;
-      if (solution == null) throw new InvalidOperationException("Encoding is not of type PRVEncoding");
-      return DecodeSchedule(solution, jobData);
-    }
-
-    public static Schedule DecodeSchedule(PRVEncoding solution, ItemList<Job> jobData) {
+    public override Schedule DecodeSchedule(PRVEncoding encoding, ItemList<Job> jobData) {
+      return Decode(encoding, jobData);
+    }
+
+    public static Schedule Decode(PRVEncoding solution, ItemList<Job> jobData) {
       var random = new FastRandom(solution.RandomSeed);
       var jobs = (ItemList<Job>)jobData.Clone();