Changeset 13443 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleRandomCreator.cs

Timestamp:

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

Author:

mkommend

Message:

#2521: Adapted decoders for SchedulingProblem.

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleRandomCreator.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -55 +54 @@
 
 
-    public static Schedule Apply(int jobs, int resources, PWREncoding pwr, ItemList<Job> jobData) {
+    public static Schedule Apply(PWREncoding pwr, ItemList<Job> jobData) {
       var resultingSchedule = new Schedule(jobData[0].Tasks.Count);
       foreach (int jobNr in pwr.PermutationWithRepetition) {
@@ -71 +70 @@
 
     protected override ISchedule CreateSolution() {
-      try {
-        var jobData = (ItemList<Job>)JobDataParameter.ActualValue.Clone();
-        return Apply(JobsParameter.ActualValue.Value,
-          ResourcesParameter.ActualValue.Value,
-          new PWREncoding(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue),
-          jobData);
-      }
-      catch {
-        throw new Exception("ScheduleRandomCreator needs JobData parameter from a JSSP-Instance to create Schedule-Instances!");
-      }
+      var jobData = (ItemList<Job>)JobDataParameter.ActualValue.Clone();
+      var pwrEncoding = new PWREncoding(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value,
+        RandomParameter.ActualValue);
+      return Apply(pwrEncoding, jobData);
     }
   }