Changeset 8886 for trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding

Timestamp:

11/11/12 01:46:34 (12 years ago)

Author:

abeham

Message:

#1329:

• Removed unnecessary DueDates parameter
• Changed ValueParameter to FixedValueParameter for Jobs and Resources
• Made Job and Task INotifyPropertyChanged
• Added a JobView and TaskView

Location:

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding

Files:

• Job.cs (modified) (4 diffs)
• Task.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Job.cs

@@ -20 +20 @@
 #endregion
 
+using System.ComponentModel;
 using System.Text;
 using HeuristicLab.Common;
@@ -28 +29 @@
   [Item("Job", "Represents a composition of tasks that require processing in a scheduling problem.")]
   [StorableClass]
-  public class Job : Item {
-    [Storable]
-    public double DueDate { get; set; }
-    [Storable]
-    public int Index { get; set; }
-    [Storable]
-    public ItemList<Task> Tasks { get; set; }
+  public class Job : Item, INotifyPropertyChanged {
+    [Storable(Name = "DueDate")] private double dueDate;
+    public double DueDate {
+      get { return dueDate; }
+      set {
+        bool changed = dueDate != value;
+        dueDate = value;
+        if (changed) OnPropertyChanged("DueDate");
+      }
+    }
+
+    [Storable(Name = "Index")]
+    private int index;
+    public int Index {
+      get { return index; }
+      set {
+        bool changed = index != value;
+        index = value;
+        if (changed) OnPropertyChanged("Index");
+      }
+    }
+
+    [Storable(Name = "Tasks")]
+    private ItemList<Task> tasks; 
+    public ItemList<Task> Tasks {
+      get { return tasks; }
+      set {
+        bool changed = tasks != value;
+        tasks = value;
+        if (changed) OnPropertyChanged("Tasks");
+      }
+    }
 
     [StorableConstructor]
@@ -49 +75 @@
     public Job(int index, double dueDate)
       : base() {
+      DueDate = dueDate;
       Index = index;
       Tasks = new ItemList<Task>();
-
-      DueDate = dueDate;
-
     }
 
     public override string ToString() {
-      StringBuilder sb = new StringBuilder();
+      var sb = new StringBuilder();
       sb.Append("Job#" + Index + " [ ");
       foreach (Task t in Tasks) {
@@ -68 +92 @@
 
     internal Task GetPreviousTask(Task t) {
-      if (t.TaskNr == 0)
-        return null;
-      else
-        return Tasks[t.TaskNr - 1];
+      if (t.TaskNr == 0) return null;
+      return Tasks[t.TaskNr - 1];
     }
 
-
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged(string propertyName) {
+      var handler = PropertyChanged;
+      if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+    }
   }
 }

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Task.cs

@@ -20 +20 @@
 #endregion
 
+using System.ComponentModel;
 using System.Text;
 using HeuristicLab.Common;
@@ -28 +29 @@
   [Item("Task", "Represents a task that has to be scheduled.")]
   [StorableClass]
-  public class Task : Item {
-    [Storable]
-    public int TaskNr { get; set; }
-    [Storable]
-    public int ResourceNr { get; set; }
-    [Storable]
-    public int JobNr { get; set; }
-    [Storable]
-    public double Duration { get; set; }
-    [Storable]
-    public bool IsScheduled { get; set; }
+  public class Task : Item, INotifyPropertyChanged {
+    [Storable(Name = "TaskNr")]
+    private int taskNr;
+    public int TaskNr {
+      get { return taskNr; }
+      set {
+        bool changed = taskNr != value;
+        taskNr = value;
+        if (changed) OnPropertyChanged("TaskNr");
+      }
+    }
+    [Storable(Name = "ResourceNr")]
+    private int resourceNr;
+    public int ResourceNr {
+      get { return resourceNr; }
+      set {
+        bool changed = resourceNr != value;
+        resourceNr = value;
+        if (changed) OnPropertyChanged("ResourceNr");
+      }
+    }
+
+    [Storable(Name = "JobNr")]
+    private int jobNr;
+    public int JobNr {
+      get { return jobNr; }
+      set {
+        bool changed = jobNr != value;
+        jobNr = value;
+        if (changed) OnPropertyChanged("JobNr");
+      }
+    }
+
+    [Storable(Name = "Duration")]
+    private double duration;
+    public double Duration {
+      get { return duration; }
+      set {
+        bool changed = duration != value;
+        duration = value;
+        if (changed) OnPropertyChanged("Duration");
+      }
+    }
+
+    [Storable(Name = "IsScheduled")]
+    private bool isScheduled;
+    public bool IsScheduled {
+      get { return isScheduled; }
+      set {
+        bool changed = isScheduled != value;
+        isScheduled = value;
+        if (changed) OnPropertyChanged("IsScheduled");
+      }
+    }
 
     [StorableConstructor]
@@ -86 +130 @@
         task1.TaskNr == task2.TaskNr);
     }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged(string propertyName) {
+      var handler = PropertyChanged;
+      if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+    }
   }
 }