Changeset 6412 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders

Timestamp:

06/14/11 14:53:14 (14 years ago)

Author:

jhelm

Message:

#1329: Did some minor changes affecting datatypes.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders

Files:

• GTAlgorithmUtils.cs (modified) (3 diffs)
• JSMDecoder.cs (modified) (6 diffs)
• PRVDecoder.cs (modified) (8 diffs)
• PWRDecoder.cs (modified) (1 diff)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders/GTAlgorithmUtils.cs

@@ -31 +31 @@
       foreach (Job j in jobData) {
         foreach (Task t in j.Tasks) {
-          if (!t.IsScheduled.Value) {
+          if (!t.IsScheduled) {
             result.Add(t);
             break;
@@ -56 +56 @@
       result.Add(conflictedTask);
       foreach (Task t in earliestTasksList) {
-        if (t.ResourceNr.Value == conflictedTask.ResourceNr.Value) {
+        if (t.ResourceNr == conflictedTask.ResourceNr) {
           if (ComputeEarliestStartTime(t, schedule) < conflictedCompletionTime)
             result.Add(t);
@@ -65 +65 @@
 
     public static double ComputeEarliestStartTime(Task t, Schedule schedule) {
-      ScheduledTask previousTask = schedule.GetLastScheduledTaskForJobNr(t.JobNr.Value);
-      Resource affectedResource = schedule.Resources[t.ResourceNr.Value];
-      double lastMachineEndTime = affectedResource.TotalDuration.Value;
+      ScheduledTask previousTask = schedule.GetLastScheduledTaskForJobNr(t.JobNr);
+      Resource affectedResource = schedule.Resources[t.ResourceNr];
+      double lastMachineEndTime = affectedResource.TotalDuration;
       double previousJobTaskEndTime = 0;
       if (previousTask != null)
-        previousJobTaskEndTime = previousTask.EndTime.Value;
+        previousJobTaskEndTime = previousTask.EndTime;
 
       return Math.Max(previousJobTaskEndTime, lastMachineEndTime);
     }
     public static double ComputeEarliestCompletionTime(Task t, Schedule schedule) {
-      return ComputeEarliestStartTime(t, schedule) + t.Duration.Value;
+      return ComputeEarliestStartTime(t, schedule) + t.Duration;
     }
   }

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.cs

@@ -86 +86 @@
       //scan conflictSet for given solutionCandidate, and return if found
       foreach (Task t in conflictSet) {
-        if (t.JobNr.Value == solutionCandidateJobNr)
+        if (t.JobNr == solutionCandidateJobNr)
           return t;
       }
@@ -94 +94 @@
       int newResolutionIndex = 0;
 
-      while (newResolutionIndex < jsm[conflictedResourceNr].Length && jsm[conflictedResourceNr][newResolutionIndex] != result.JobNr.Value)
+      while (newResolutionIndex < jsm[conflictedResourceNr].Length && jsm[conflictedResourceNr][newResolutionIndex] != result.JobNr)
         newResolutionIndex++;
-      ApplyForcingStrategy(jsm, conflictedResourceNr, newResolutionIndex, progressOnConflictedResource, result.JobNr.Value);
+      ApplyForcingStrategy(jsm, conflictedResourceNr, newResolutionIndex, progressOnConflictedResource, result.JobNr);
 
       return result;
@@ -108 +108 @@
         for (int i = progress; i < resource.Length; i++) {
           int j = 0;
-          while (j < conflictSet.Count && conflictSet[j].JobNr.Value != resource[i])
+          while (j < conflictSet.Count && conflictSet[j].JobNr != resource[i])
             j++;
 
@@ -145 +145 @@
       foreach (Job j in jobs) {
         foreach (Task t in j.Tasks) {
-          t.IsScheduled.Value = false;
+          t.IsScheduled = false;
         }
       }
@@ -155 +155 @@
         //STEP 1 - Get earliest not scheduled operation with minimal earliest completing time
         Task minimal = GTAlgorithmUtils.GetTaskWithMinimalEC(earliestTasksList, resultingSchedule);
-        int conflictedResourceNr = minimal.ResourceNr.Value;
+        int conflictedResourceNr = minimal.ResourceNr;
         Resource conflictedResource = resultingSchedule.Resources[conflictedResourceNr];
 
@@ -166 +166 @@
 
         //STEP 4 - Add the selected task to the current schedule 
-        selectedTask.IsScheduled.Value = true;
+        selectedTask.IsScheduled = true;
         double startTime = GTAlgorithmUtils.ComputeEarliestStartTime(selectedTask, resultingSchedule);
-        resultingSchedule.ScheduleTask(selectedTask.ResourceNr.Value, startTime, selectedTask.Duration.Value, selectedTask.JobNr.Value);
+        resultingSchedule.ScheduleTask(selectedTask.ResourceNr, startTime, selectedTask.Duration, selectedTask.JobNr);
 
         //STEP 5 - Back to STEP 1

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.cs

@@ -72 +72 @@
       Task currentResult = RandomRule(tasks);
       foreach (Task t in tasks) {
-        if (t.Duration.Value < currentResult.Duration.Value)
+        if (t.Duration < currentResult.Duration)
           currentResult = t;
       }
@@ -82 +82 @@
       Task currentResult = RandomRule(tasks);
       foreach (Task t in tasks) {
-        if (t.Duration.Value > currentResult.Duration.Value)
+        if (t.Duration > currentResult.Duration)
           currentResult = t;
       }
@@ -94 +94 @@
       foreach (Task t in tasks) {
         double remainingProcessingTime = 0;
-        foreach (Task jt in jobs[t.JobNr.Value].Tasks) {
-          if (!jt.IsScheduled.Value)
-            remainingProcessingTime += jt.Duration.Value;
+        foreach (Task jt in jobs[t.JobNr].Tasks) {
+          if (!jt.IsScheduled)
+            remainingProcessingTime += jt.Duration;
         }
         if (remainingProcessingTime > currentLargestRemainingProcessingTime) {
@@ -112 +112 @@
       foreach (Task t in tasks) {
         double remainingProcessingTime = 0;
-        foreach (Task jt in jobs[t.JobNr.Value].Tasks) {
-          if (!jt.IsScheduled.Value)
-            remainingProcessingTime += jt.Duration.Value;
+        foreach (Task jt in jobs[t.JobNr].Tasks) {
+          if (!jt.IsScheduled)
+            remainingProcessingTime += jt.Duration;
         }
         if (remainingProcessingTime < currentSmallestRemainingProcessingTime) {
@@ -130 +130 @@
       foreach (Task t in tasks) {
         int nrOfRemainingTasks = 0;
-        foreach (Task jt in jobs[t.JobNr.Value].Tasks) {
-          if (!jt.IsScheduled.Value)
+        foreach (Task jt in jobs[t.JobNr].Tasks) {
+          if (!jt.IsScheduled)
             nrOfRemainingTasks++;
         }
@@ -148 +148 @@
       foreach (Task t in tasks) {
         int nrOfRemainingTasks = 0;
-        foreach (Task jt in jobs[t.JobNr.Value].Tasks) {
-          if (!jt.IsScheduled.Value)
+        foreach (Task jt in jobs[t.JobNr].Tasks) {
+          if (!jt.IsScheduled)
             nrOfRemainingTasks++;
         }
@@ -218 +218 @@
       foreach (Job j in jobs) {
         foreach (Task t in j.Tasks) {
-          t.IsScheduled.Value = false;
+          t.IsScheduled = false;
         }
       }
@@ -235 +235 @@
         //STEP 3 - Select an operation from the conflict set (various methods depending on how the algorithm should work..)
         //Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector [currentDecisionIndex++], solution.NrOfRules.Value);
-        Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector[minimal.JobNr.Value], solution.NrOfRules.Value);
+        Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector[minimal.JobNr], solution.NrOfRules.Value);
 
         //STEP 4 - Adding the selected operation to the current schedule
-        selectedTask.IsScheduled.Value = true;
+        selectedTask.IsScheduled = true;
         double startTime = GTAlgorithmUtils.ComputeEarliestStartTime(selectedTask, resultingSchedule);
-        resultingSchedule.ScheduleTask(selectedTask.ResourceNr.Value, startTime, selectedTask.Duration.Value, selectedTask.JobNr.Value);
+        resultingSchedule.ScheduleTask(selectedTask.ResourceNr, startTime, selectedTask.Duration, selectedTask.JobNr);
 
         //STEP 5 - Back to STEP 1

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders/PWRDecoder.cs

@@ -60 +60 @@
       foreach (int jobNr in solution.PermutationWithRepetition) {
         int i = 0;
-        while (jobs[jobNr].Tasks[i].IsScheduled.Value) i++;
+        while (jobs[jobNr].Tasks[i].IsScheduled) i++;
         Task currentTask = jobs[jobNr].Tasks[i];
         double startTime = GTAlgorithmUtils.ComputeEarliestStartTime(currentTask, resultingSchedule);
-        currentTask.IsScheduled.Value = true;
-        resultingSchedule.ScheduleTask(currentTask.ResourceNr.Value, startTime, currentTask.Duration.Value, currentTask.JobNr.Value);
+        currentTask.IsScheduled = true;
+        resultingSchedule.ScheduleTask(currentTask.ResourceNr, startTime, currentTask.Duration, currentTask.JobNr);
       }
       return resultingSchedule;