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

Timestamp:

06/06/11 11:23:43 (13 years ago)

Author:

jhelm

Message:

#1329: Did some minor refactoring.

Location:

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

Files:

• JSMDecoder.cs (modified) (2 diffs)
• PRVDecoder.cs (modified) (4 diffs)

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

@@ -36 +36 @@
 
 namespace HeuristicLab.Problems.Scheduling.Decoders {
-  [Item("Job Sequencing Matrix Decoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
+  [Item("Job Sequence Matrix Decoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequence Matrix.")]
   [StorableClass]
   public class JSMDecoder : SchedulingDecoder<JSMEncoding>, IStochasticOperator, IJSSPOperator {
@@ -76 +76 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
-      Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the JSSP - Instance."));
+      Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Job data taken from the Schedulingproblem - Instance."));
     }
 

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

@@ -197 +197 @@
     }
 
-    private ItemList<Task> GetEarliestNotScheduledTasks() {
-      ItemList<Task> result = new ItemList<Task>();
-      foreach (Job j in jobs) {
-        foreach (Task t in j.Tasks) {
-          if (!t.IsScheduled.Value) {
-            result.Add(t);
-            break;
-          }
-        }
-      }
-      return result;
-    }
-    private Task GetTaskWithMinimalEC(ItemList<Task> earliestTasksList) {
-      double minEct = double.MaxValue;
-      Task result = null;
-      foreach (Task t in earliestTasksList) {
-        double ect = GTAlgorithmUtils.ComputeEarliestCompletionTime(t, resultingSchedule);
-        if (ect < minEct) {
-          result = t;
-          minEct = ect;
-        }
-      }
-      return result;
-    }
-    private ItemList<Task> GetConflictSetForTask(Task conflictedTask, ItemList<Task> earliestTasksList) {
-      ItemList<Task> result = new ItemList<Task>();
-      double conflictedCompletionTime = GTAlgorithmUtils.ComputeEarliestCompletionTime(conflictedTask, resultingSchedule);
-      foreach (Task t in earliestTasksList) {
-        if (t.ResourceNr.Value == conflictedTask.ResourceNr.Value) {
-          if (GTAlgorithmUtils.ComputeEarliestStartTime(t, resultingSchedule) < conflictedCompletionTime)
-            result.Add(t);
-        }
-      }
-      return result;
-    }
+
+
     private Task SelectTaskFromConflictSet(ItemList<Task> conflictSet, int ruleIndex, int nrOfRules) {
       if (conflictSet.Count == 1)
         return conflictSet[0];
-      
+
       ruleIndex = ruleIndex % nrOfRules;
       switch (ruleIndex) {
@@ -249 +216 @@
         case 9: return RandomRule(conflictSet);
         default: return RandomRule(conflictSet);
-      }  
+      }
     }
 
@@ -265 +232 @@
       //GT-Algorithm
       //STEP 0 - Compute a list of "earliest operations"
-      ItemList<Task> earliestTasksList = GetEarliestNotScheduledTasks();
-      int currentDecisionIndex = 0;
+      ItemList<Task> earliestTasksList = GTAlgorithmUtils.GetEarliestNotScheduledTasks(jobs);
+      //int currentDecisionIndex = 0;
       while (earliestTasksList.Count > 0) {
         //STEP 1 - Get earliest not scheduled operation with minimal earliest completing time
-        Task minimal = GetTaskWithMinimalEC(earliestTasksList);
+        Task minimal = GTAlgorithmUtils.GetTaskWithMinimalEC(earliestTasksList, resultingSchedule);
 
         //STEP 2 - Compute a conflict set of all operations that can be scheduled on the machine the previously selected operation runs on
-        ItemList<Task> conflictSet = GetConflictSetForTask(minimal, earliestTasksList);
+        ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, jobs, resultingSchedule);
 
         //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 [currentDecisionIndex++], solution.NrOfRules.Value);
+        Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector[minimal.JobNr.Value], solution.NrOfRules.Value);
 
         //STEP 4 - Adding the selected operation to the current schedule
@@ -283 +251 @@
 
         //STEP 5 - Back to STEP 1
-        earliestTasksList = GetEarliestNotScheduledTasks();
+        earliestTasksList = GTAlgorithmUtils.GetEarliestNotScheduledTasks(jobs);
       }