Changeset 361 for trunk/sources

Timestamp:

07/03/08 09:52:15 (16 years ago)

Author:

mkofler

Message:

Set default timespan in the ScheduleInjector to Int32.MaxVal. Fixed issue with overwritten time slots (occurred when the processing time was zero).

Location:

trunk/sources/HeuristicLab.Scheduling.JSSP

Files:

• ScheduleInjector.cs (modified) (1 diff)
• ScheduleTree.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Scheduling.JSSP/ScheduleInjector.cs

@@ -43 +43 @@
       AddVariableInfo(new VariableInfo("Timespan", "Desired timespan for the schedule", typeof(IntData), VariableKind.In));
       GetVariableInfo("Timespan").Local = true;
-      AddVariable(new Variable("Timespan", new IntData(10000)));
+      AddVariable(new Variable("Timespan", new IntData(Int32.MaxValue)));
       AddVariableInfo(new VariableInfo("Schedule", "Schedule", typeof(Schedule), VariableKind.New));
     }

trunk/sources/HeuristicLab.Scheduling.JSSP/ScheduleTree.cs

@@ -110 +110 @@
 
     private bool FitsIntoEmptySlot(TimeSlot slot, int start, int duration) {
-      return ((slot.free >= duration) && (slot.start <= start) && (slot.end >= start + duration));
+      // beware of operations with processing time zero --> check operation != null
+      return ((slot.free >= duration) && (slot.start <= start) && (slot.end >= start + duration) && (slot.operation == null));
     }
 
@@ -133 +134 @@
       }
       if(IsLeaf(slot)) {
-        // fits exactly into slot
-        if((slot.Data.start == op.Start) && (slot.Data.end == end)) {
+        // fits exactly into slot; beware of operations with processing time 0 --> check operation != null
+        if((slot.Data.start == op.Start) && (slot.Data.end == end) && (slot.Data.operation == null)) {
           slot.Data = new TimeSlot(op);
           UpdateMaxFreeSlot(slot);