Changeset 6177 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Resource.cs

Timestamp:

05/10/11 17:25:35 (13 years ago)

Author:

jhelm

Message:

#1329: Implemented PriorityRulesVector based encoding and added new operators to the JSMEncoding. Added Gantt-Charts for visualization of schedules and problems.

File:

• branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Resource.cs (modified) (4 diffs)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Resource.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 
-//ATTENTION! This class may have lots of parallels with the HeuristicLab.Problems.Scheduling.JSSPJob class.
-
 namespace HeuristicLab.Problems.Scheduling {
   [Item("Resource Class", "Represents a resource used in scheduling problems.")]
   [StorableClass]
-  public class Resource : ParameterizedNamedItem {
+  public class Resource : IndexedTaskList {
     [StorableConstructor]
     protected Resource(bool deserializing) : base(deserializing) { }
     protected Resource(Resource original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceIndex = cloner.Clone(original.ResourceIndex);
-      this.Tasks = cloner.Clone(original.Tasks);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -47 +43 @@
     }
 
-    #region Parameter Properties
-    public ValueParameter<IntValue> ResourceIndexParameter {
-      get { return (ValueParameter<IntValue>)Parameters["ResourceIndex"]; }
-    }
-    public ValueParameter<ItemList<Task>> TasksParameter {
-      get { return (ValueParameter<ItemList<Task>>)Parameters["Tasks"]; }
-    }
-    #endregion
-
-    #region Properties
-    public IntValue ResourceIndex {
-      get { return ResourceIndexParameter.Value; }
-      set { ResourceIndexParameter.Value = value; }
-    }
-    public ItemList<Task> Tasks {
-      get { return TasksParameter.Value; }
-      set { TasksParameter.Value = value; }
-    }
     public DoubleValue TotalDuration {
       get {
@@ -73 +51 @@
       }
     }
-    #endregion
 
-
-    public Resource(IntValue ri) {
-      Parameters.Add(new ValueParameter<IntValue>("ResourceIndex", "The index of the resource in the associated Scheduling Problem.", new IntValue()));
-      Parameters.Add(new ValueParameter<ItemList<Task>>("Tasks", "Taskdata defining duration, start-time and resource assignment of the tasks.", new ItemList<Task>()));
-
-      ResourceIndex = ri;
-      Tasks = new ItemList<Task>();
-    }
-
+    public Resource(IntValue index) : base (index) { }
 
     public override string ToString() {
       StringBuilder sb = new StringBuilder();
-      sb.Append("Job" + ResourceIndex + " [ ");
-      foreach (Task t in Tasks) {
+      sb.Append("Resource#" + Index + " [ ");
+      foreach (JSSPTask t in Tasks) {
         sb.Append(t.ToString() + " ");
       }
@@ -94 +63 @@
       return sb.ToString();
     }
-
   }
 }