Changeset 13435 for branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling

Timestamp:

12/04/15 10:35:04 (9 years ago)

Author:

mkommend

Message:

#2521: Intermediate version of schedule encoding refactoring.

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3

Files:

• Analyzers/BestSchedulingSolutionAnalyzer.cs (modified) (2 diffs)
• Decoders/JSMDecoder.cs (modified) (1 diff)
• Decoders/PRVDecoder.cs (modified) (1 diff)
• Decoders/PWRDecoder.cs (modified) (1 diff)
• Decoders/ScheduleDecoder.cs (modified) (2 diffs)
• Interfaces/IScheduleDecoder.cs (modified) (1 diff)
• JobShopSchedulingProblem.cs (modified) (6 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Analyzers/BestSchedulingSolutionAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -77 +78 @@
       if (bestSolution == null) {
         bestSolution = (Schedule)solutions[i].Clone();
-        bestSolution.Quality = (DoubleValue)qualities[i].Clone();
+        bestSolution.Quality = qualities[i].Value;
         BestSolutionParameter.ActualValue = bestSolution;
         results.Add(new Result("Best Scheduling Solution", bestSolution));
       } else {
-        if (max && bestSolution.Quality.Value < qualities[i].Value ||
-          !max && bestSolution.Quality.Value > qualities[i].Value) {
-          bestSolution.Quality.Value = qualities[i].Value;
-          bestSolution.Resources = (ItemList<Resource>)solutions[i].Resources.Clone();
+        if (max && bestSolution.Quality < qualities[i].Value ||
+          !max && bestSolution.Quality > qualities[i].Value) {
+          bestSolution.Quality = qualities[i].Value;
+          bestSolution.Resources.Clear();
+          bestSolution.Resources.AddRange((IEnumerable<Resource>)solutions[i].Resources.Clone());
         }
       }

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.cs

@@ -177 +177 @@
     }
 
-    public override Schedule CreateScheduleFromEncoding(IScheduleEncoding encoding) {
+    public override Schedule CreateScheduleFromEncoding(ISchedule encoding) {
       var solution = encoding as JSMEncoding;
       if (solution == null) throw new InvalidOperationException("Encoding is not of type JSMEncoding");

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.cs

@@ -202 +202 @@
     }
 
-    public override Schedule CreateScheduleFromEncoding(IScheduleEncoding encoding) {
+    public override Schedule CreateScheduleFromEncoding(ISchedule encoding) {
       var solution = encoding as PRVEncoding;
-      if (solution == null) throw new InvalidOperationException("Encoding is not of type PWREncoding");
+      if (solution == null) throw new InvalidOperationException("Encoding is not of type PRVEncoding");
 
       var jobs = (ItemList<Job>)JobDataParameter.ActualValue.Clone();

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/PWRDecoder.cs

@@ -55 +55 @@
     }
 
-    public override Schedule CreateScheduleFromEncoding(IScheduleEncoding encoding) {
+    public override Schedule CreateScheduleFromEncoding(ISchedule encoding) {
       var solution = encoding as PWREncoding;
       if (solution == null) throw new InvalidOperationException("Encoding is not of type PWREncoding");

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/ScheduleDecoder.cs

@@ -32 +32 @@
   public abstract class ScheduleDecoder : SingleSuccessorOperator, IScheduleDecoder {
 
-    public ILookupParameter<IScheduleEncoding> ScheduleEncodingParameter {
-      get { return (ILookupParameter<IScheduleEncoding>)Parameters["ScheduleEncoding"]; }
+    public ILookupParameter<ISchedule> ScheduleEncodingParameter {
+      get { return (ILookupParameter<ISchedule>)Parameters["ScheduleEncoding"]; }
     }
     public ILookupParameter<Schedule> ScheduleParameter {
@@ -44 +44 @@
     public ScheduleDecoder()
       : base() {
-      Parameters.Add(new LookupParameter<IScheduleEncoding>("ScheduleEncoding", "The new scheduling solution represented as encoding."));
+      Parameters.Add(new LookupParameter<ISchedule>("ScheduleEncoding", "The new scheduling solution represented as encoding."));
       Parameters.Add(new LookupParameter<Schedule>("Schedule", "The decoded scheduling solution represented as generalized schedule."));
     }
 
-    public abstract Schedule CreateScheduleFromEncoding(IScheduleEncoding solution);
+    public abstract Schedule CreateScheduleFromEncoding(ISchedule solution);
 
     public override IOperation Apply() {

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Interfaces/IScheduleDecoder.cs

@@ -24 +24 @@
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   public interface IScheduleDecoder : IOperator {
-    ILookupParameter<IScheduleEncoding> ScheduleEncodingParameter { get; }
+    ILookupParameter<ISchedule> ScheduleEncodingParameter { get; }
     ILookupParameter<Schedule> ScheduleParameter { get; }
   }

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -164 +164 @@
       ScheduleEvaluatorParameter.ValueChanged += ScheduleEvaluatorParameter_ValueChanged;
       ScheduleEvaluator.QualityParameter.ActualNameChanged += ScheduleEvaluator_QualityParameter_ActualNameChanged;
-      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
+      SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
       ScheduleDecoderParameter.ValueChanged += ScheduleDecoderParameter_ValueChanged;
       if (ScheduleDecoder != null) ScheduleDecoder.ScheduleParameter.ActualNameChanged += ScheduleDecoder_ScheduleParameter_ActualNameChanged;
@@ -171 +171 @@
     #region Events
     protected override void OnSolutionCreatorChanged() {
-      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
+      SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
       InitializeOperators();
     }
@@ -288 +288 @@
 
       if (ScheduleDecoder != null)
-        ScheduleDecoder.ScheduleEncodingParameter.ActualName = SolutionCreator.ScheduleEncodingParameter.ActualName;
+        ScheduleDecoder.ScheduleEncodingParameter.ActualName = SolutionCreator.ScheduleParameter.ActualName;
 
       if (ScheduleDecoder != null) {
@@ -295 +295 @@
       } else if (SolutionCreator is DirectScheduleRandomCreator) {
         var directEvaluator = (DirectScheduleRandomCreator)SolutionCreator;
-        ScheduleEvaluator.ScheduleParameter.ActualName = directEvaluator.ScheduleEncodingParameter.ActualName;
+        ScheduleEvaluator.ScheduleParameter.ActualName = directEvaluator.ScheduleParameter.ActualName;
         ScheduleEvaluator.ScheduleParameter.Hidden = true;
       } else {
@@ -303 +303 @@
 
       foreach (var op in Operators.OfType<IScheduleManipulator>()) {
-        op.ScheduleEncodingParameter.ActualName = SolutionCreator.ScheduleEncodingParameter.ActualName;
-        op.ScheduleEncodingParameter.Hidden = true;
+        op.ScheduleParameter.ActualName = SolutionCreator.ScheduleParameter.ActualName;
+        op.ScheduleParameter.Hidden = true;
       }
 
       foreach (var op in Operators.OfType<IScheduleCrossover>()) {
-        op.ChildParameter.ActualName = SolutionCreator.ScheduleEncodingParameter.ActualName;
+        op.ChildParameter.ActualName = SolutionCreator.ScheduleParameter.ActualName;
         op.ChildParameter.Hidden = true;
-        op.ParentsParameter.ActualName = SolutionCreator.ScheduleEncodingParameter.ActualName;
+        op.ParentsParameter.ActualName = SolutionCreator.ScheduleParameter.ActualName;
         op.ParentsParameter.Hidden = true;
       }
@@ -320 +320 @@
           op.ScheduleParameter.Hidden = true;
         } else if (SolutionCreator is DirectScheduleRandomCreator) {
-          op.ScheduleParameter.ActualName = ((DirectScheduleRandomCreator)SolutionCreator).ScheduleEncodingParameter.ActualName;
+          op.ScheduleParameter.ActualName = ((DirectScheduleRandomCreator)SolutionCreator).ScheduleParameter.ActualName;
           op.ScheduleParameter.Hidden = true;
         } else {