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

Timestamp:

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

Author:

jhelm

Message:

#1329: Did some minor changes affecting datatypes.

File:

• branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.cs (modified) (8 diffs)

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