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

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/ScheduleEncoding

Files:

• Crossovers/DirectScheduleCrossover.cs (modified) (1 diff)
• Crossovers/DirectScheduleGTCrossover.cs (modified) (1 diff)
• Decoder (added)
• Decoder/DirectScheduleDecoder.cs (added)
• DirectScheduleEncoding.cs (modified) (2 diffs)
• DirectScheduleRandomCreator.cs (modified) (3 diffs)
• Manipulators/DirectScheduleManipulator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleCrossover.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("DirectScheduleCrossover", "An operator which crosses two schedule representations.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("DirectScheduleGTCrossover", "Represents a crossover using the GT-Algorithm to cross two direct schedule representations.")]
   [StorableClass]

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleEncoding.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 DirectScheduleEncoding : ScheduleEncoding {
+  public sealed class DirectScheduleEncoding : ScheduleEncoding<Schedule> {
     [StorableConstructor]
     private DirectScheduleEncoding(bool deserializing) : base(deserializing) { }
@@ -44 +43 @@
       : base() {
       SolutionCreator = new DirectScheduleRandomCreator();
+      Decoder = new DirectScheduleDecoder();
       DiscoverOperators();
     }
+
 
     #region Operator Discovery

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

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Manipulators/DirectScheduleManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding {
+namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("DirectScheduleManipulator", "An operator which manipulates a direct schedule representation.")]
   [StorableClass]