Changeset 13435 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

Timestamp:

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

Author:

mkommend

Message:

#2521: Intermediate version of schedule encoding refactoring.

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs (modified) (7 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +30 @@
   [Item("Schedule", "Represents the general solution for scheduling problems.")]
   [StorableClass]
-  public class Schedule : NamedItem, IScheduleEncoding {
+  public class Schedule : NamedItem, ISchedule {
 
     #region Properties
@@ -38 +37 @@
     public ItemList<Resource> Resources {
       get { return resources; }
-      set {
-        if (resources != null) DeregisterResourcesEvents();
-        resources = value;
-        if (resources != null) RegisterResourcesEvents();
-        OnResourcesChanged();
-      }
     }
     [Storable]
-    private DoubleValue quality;
-    public DoubleValue Quality {
+    private double quality;
+    public double Quality {
       get { return quality; }
       set {
-        if (quality != value) {
-          if (quality != null) DeregisterQualityEvents();
-          quality = value;
-          if (quality != null) RegisterQualityEvents();
-          OnQualityChanged();
-        }
+        if (quality == value) return;
+        quality = value;
+        OnQualityChanged();
       }
     }
@@ -66 +56 @@
     protected Schedule(Schedule original, Cloner cloner)
       : base(original, cloner) {
-      this.Resources = cloner.Clone(original.Resources);
-      this.Quality = cloner.Clone(original.Quality);
+      this.resources = cloner.Clone(original.Resources);
+      this.quality = original.Quality;
+      //TODO clone
       this.lastScheduledTaskOfJob = new Dictionary<int, ScheduledTask>(original.lastScheduledTaskOfJob);
+
+      RegisterResourcesEvents();
     }
     public Schedule(int nrOfResources) {
-      Resources = new ItemList<Resource>();
+      resources = new ItemList<Resource>();
       for (int i = 0; i < nrOfResources; i++) {
         Resources.Add(new Resource(i));
       }
       lastScheduledTaskOfJob = new Dictionary<int, ScheduledTask>();
+
+      RegisterResourcesEvents();
     }
 
@@ -89 +84 @@
         changed(this, EventArgs.Empty);
     }
-    private void RegisterQualityEvents() {
-      Quality.ValueChanged += new EventHandler(Quality_ValueChanged);
-    }
-    private void DeregisterQualityEvents() {
-      Quality.ValueChanged -= new EventHandler(Quality_ValueChanged);
-    }
-    private void Quality_ValueChanged(object sender, EventArgs e) {
-      OnQualityChanged();
-    }
 
     public event EventHandler ResourcesChanged;
@@ -107 +93 @@
     private void RegisterResourcesEvents() {
       Resources.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(Resources_PropertyChanged);
-    }
-    private void DeregisterResourcesEvents() {
-      Resources.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(Resources_PropertyChanged);
     }
     private void Resources_PropertyChanged(object sender, EventArgs e) {
@@ -154 +137 @@
       return sb.ToString();
     }
-
-    public double CalculateMakespan() {
-      double quality = 0;
-      foreach (Resource r in Resources) {
-        if (r.TotalDuration > quality) {
-          quality = r.TotalDuration;
-        }
-      }
-      return quality;
-    }
   }
 }