Changeset 6177 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/JSSPJob.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/JSSPJob.cs (modified) (3 diffs)

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

@@ -33 +33 @@
   [Item("Job Class", "Represents a composition of tasks that require processing in a job shop scheduling problem.")]
   [StorableClass]
-  public class JSSPJob : ParameterizedNamedItem {
+  public class JSSPJob : IndexedTaskList {
     [StorableConstructor]
     protected JSSPJob(bool deserializing) : base(deserializing) { }
     protected JSSPJob(JSSPJob original, Cloner cloner)
       : base(original, cloner) {
-      this.JobIndex = cloner.Clone(original.JobIndex);
-      this.Tasks = cloner.Clone(original.Tasks);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -45 +43 @@
     }
 
-    #region Parameter Properties
-    public ValueParameter<IntValue> JobIndexParameter {
-      get { return (ValueParameter<IntValue>)Parameters["JobIndex"]; }
-    }
-
-    public ValueParameter<ItemList<Task>> TasksParameter {
-      get { return (ValueParameter<ItemList<Task>>)Parameters["Tasks"]; }
-    }
-    #endregion
-
-    #region Properties
-    public IntValue JobIndex {
-      get { return JobIndexParameter.Value; }
-      set { JobIndexParameter.Value = value; }
-    }
-    public ItemList<Task> Tasks {
-      get { return TasksParameter.Value; }
-      set { TasksParameter.Value = value; }
-    }
-    #endregion
-
-
-    public JSSPJob(IntValue ji) {
-      Parameters.Add(new ValueParameter<IntValue>("JobIndex", "The index of the job in the associated JSSP-Instance.", new IntValue()));
-      Parameters.Add(new ValueParameter<ItemList<Task>>("Tasks", "Taskdata defining duration, start-time and resource assignment of the tasks.", new ItemList<Task>()));
-
-      JobIndex = ji;
-      Tasks = new ItemList<Task>();
-    }
-
+    public JSSPJob(IntValue index) : base (index) {}
 
     public override string ToString() {
       StringBuilder sb = new StringBuilder();
-      sb.Append("Job" + JobIndex + " [ ");
-      foreach (Task t in Tasks) {
+      sb.Append("Job#" + Index + " [ ");
+      foreach (JSSPTask t in Tasks) {
         sb.Append(t.ToString () + " ");
       }
@@ -85 +54 @@
       return sb.ToString();
     }
-
   }
 }