Changeset 13436 for branches/ProblemRefactoring

Timestamp:

12/04/15 11:57:54 (9 years ago)

Author:

mkommend

Message:

#2521: Minor improvements in SchedulingEncoding.

Location:

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

Files:

• GTAlgorithmUtils.cs (modified) (1 diff)
• Resource.cs (modified) (1 diff)
• Schedule.cs (modified) (2 diffs)
• Task.cs (modified) (1 diff)

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

@@ -73 +73 @@
       return Math.Max(previousJobTaskEndTime, lastMachineEndTime);
     }
-    public static double ComputeEarliestCompletionTime(Task t, Schedule schedule) {
+    private static double ComputeEarliestCompletionTime(Task t, Schedule schedule) {
       return ComputeEarliestStartTime(t, schedule) + t.Duration;
     }

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

@@ -36 +36 @@
     public ItemList<ScheduledTask> Tasks { get; private set; }
 
-    //TODO why does a Ressource has a duration?
     public double TotalDuration {
       get {

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -58 +59 @@
       this.resources = cloner.Clone(original.Resources);
       this.quality = original.Quality;
-      //TODO clone
-      this.lastScheduledTaskOfJob = new Dictionary<int, ScheduledTask>(original.lastScheduledTaskOfJob);
+      this.lastScheduledTaskOfJob = original.lastScheduledTaskOfJob.ToDictionary(kvp => kvp.Key, kvp => cloner.Clone(kvp.Value));
 
       RegisterResourcesEvents();

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

@@ -58 +58 @@
     }
 
+    //this has to be exactly the number of the job which the task belongs to
+    //otherwise everything breaks and wrong results are calculated
     [Storable(Name = "JobNr")]
     private int jobNr;