Changeset 6475 for branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding

Timestamp:

06/24/11 14:23:19 (14 years ago)

Author:

jhelm

Message:

#1329: Added DirectSchedule-Classes for optimization with the direct-schedule encoding.

Location:

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding

Files:

• Crossovers (added)
• Crossovers/DirectScheduleCrossover.cs (added)
• Crossovers/DirectScheduleGTCrossover.cs (added)
• DirectScheduleRandomCreator.cs (added)
• GTAlgorithmUtils.cs (added)
• Job.cs (added)
• Manipulators (added)
• Manipulators/ConcreteScheduleManipulator.cs (added)
• Manipulators/DirectScheduleManipulator.cs (added)
• Resource.cs (modified) (1 diff)
• Schedule.cs (modified) (3 diffs)
• ScheduledTask.cs (modified) (1 diff)
• Task.cs (added)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs

@@ -75 +75 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(Resource))
+        return AreEqual(this, obj as Resource);
+      else
+        return false;
+    }
+
+    private static bool AreEqual(Resource res1, Resource res2) {
+      if (res1.Tasks.Count != res2.Tasks.Count)
+        return false;
+      for (int i = 0; i < res1.Tasks.Count; i++) {
+        if (!res1.Tasks[i].Equals(res2.Tasks[i]))
+          return false;
+      }
+
+      return true;
+    }
   }
 }

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

@@ -31 +31 @@
   [Item("Schedule", "Represents the general solution for scheduling problems.")]
   [StorableClass]
-  public class Schedule : NamedItem {
+  public class Schedule : NamedItem, IScheduleEncoding {
     #region Properties
     [Storable]
@@ -79 +79 @@
       lastScheduledTaskOfJob = new Dictionary<int, ScheduledTask>();
     }
+
 
 
@@ -159 +160 @@
       return quality;
     }
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(Schedule))
+        return AreEqual(this, obj as Schedule);
+      else
+        return false;
+    }
+
+    private static bool AreEqual(Schedule schedule1, Schedule schedule2) {
+      if (schedule1.Resources.Count != schedule2.Resources.Count)
+        return false;
+      for (int i = 0; i < schedule1.Resources.Count; i++) {
+        if (!schedule1.Resources[i].Equals(schedule2.Resources[i]))
+          return false;
+      }
+
+      return true;
+    }
+
   }
 }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs

@@ -71 +71 @@
       return sb.ToString();
     }
+
+
+    public override bool Equals(object obj) {
+      if (obj.GetType() == typeof(ScheduledTask))
+        return AreEqual(this, obj as ScheduledTask);
+      else
+        return false;
+    }
+
+    public static bool AreEqual(ScheduledTask task1, ScheduledTask task2) {
+      return (task1.Duration == task2.Duration &&
+        task1.JobNr == task2.JobNr &&
+        task1.ResourceNr == task2.ResourceNr &&
+        task1.StartTime == task2.StartTime &&
+        task1.EndTime == task2.EndTime);
+    }
   }
 }