Changeset 6406 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Job.cs

Timestamp:

06/10/11 16:18:44 (13 years ago)

Author:

jhelm

Message:

#1329: Applied suggestions from codereview. Added unit-tests. Renamed encoding-project.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Files:

• . (modified) (1 prop)
• Job.cs (modified) (3 diffs)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.Scheduling {
@@ -34 +30 @@
   [StorableClass]
   public class Job : Item {
+    [Storable]
+    public DoubleValue DueDate { get; set; }
+    [Storable]
+    public IntValue Index { get; set; }
+    [Storable]
+    public ItemList<Task> Tasks { get; set; }
+
     [StorableConstructor]
     protected Job(bool deserializing) : base(deserializing) { }
     protected Job(Job original, Cloner cloner)
       : base(original, cloner) {
-        this.DueDate = cloner.Clone(original.DueDate);
-        this.Index = cloner.Clone(original.Index);
-        this.Tasks = cloner.Clone(original.Tasks);
+      this.DueDate = cloner.Clone(original.DueDate);
+      this.Index = cloner.Clone(original.Index);
+      this.Tasks = cloner.Clone(original.Tasks);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new Job(this, cloner);
     }
-
-    public DoubleValue DueDate { get; set; }
-
-    public IntValue Index {
-      get;
-      set;
-    }
-    public ItemList<Task> Tasks {
-      get;
-      set;
-    }
-
-
-    public Job(IntValue index, DoubleValue dueDate) : base () {
+    public Job(IntValue index, DoubleValue dueDate)
+      : base() {
       Index = index;
       Tasks = new ItemList<Task>();
@@ -72 +63 @@
       sb.Append("Job#" + Index + " [ ");
       foreach (Task t in Tasks) {
-        sb.Append(t.ToString () + " ");
+        sb.Append(t.ToString() + " ");
       }
       if (DueDate != null)

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user