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

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

Files:

• Decoders/GTAlgorithmUtils.cs (modified) (3 diffs)
• Decoders/JSMDecoder.cs (modified) (6 diffs)
• Decoders/PRVDecoder.cs (modified) (8 diffs)
• Decoders/PWRDecoder.cs (modified) (1 diff)
• Evaluators/MakespanEvaluator.cs (modified) (1 diff)
• Evaluators/MeanTardinessEvaluator.cs (modified) (1 diff)
• Job.cs (modified) (6 diffs)
• JobShopSchedulingProblem.cs (modified) (5 diffs)
• Plugin.cs (modified) (1 diff)
• Task.cs (modified) (4 diffs)

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;

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

@@ -44 +44 @@
       DoubleValue quality = new DoubleValue(0);
       foreach (Resource r in schedule.Resources) {
-        if (r.TotalDuration.Value > quality.Value) {
-          quality.Value = r.TotalDuration.Value;
+        if (r.TotalDuration > quality.Value) {
+          quality.Value = r.TotalDuration;
         }
       }

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs

@@ -59 +59 @@
       double totalTardiness = 0;
       foreach (Resource r in schedule.Resources) {
-        double tardiness = r.Tasks[r.Tasks.Count - 1].EndTime.Value - JobData[r.Tasks[r.Tasks.Count - 1].JobNr.Value].DueDate.Value;
+        double tardiness = r.Tasks[r.Tasks.Count - 1].EndTime - JobData[r.Tasks[r.Tasks.Count - 1].JobNr].DueDate;
         if (tardiness > 0)
           totalTardiness += tardiness;

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Job.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.Scheduling {
-  [Item("Job Class", "Represents a composition of tasks that require processing in a scheduling problem.")]
+  [Item("Job", "Represents a composition of tasks that require processing in a scheduling problem.")]
   [StorableClass]
   public class Job : Item {
     [Storable]
-    public DoubleValue DueDate { get; set; }
+    public double DueDate { get; set; }
     [Storable]
-    public IntValue Index { get; set; }
+    public int Index { get; set; }
     [Storable]
     public ItemList<Task> Tasks { get; set; }
@@ -41 +40 @@
     protected Job(Job original, Cloner cloner)
       : base(original, cloner) {
-      this.DueDate = cloner.Clone(original.DueDate);
-      this.Index = cloner.Clone(original.Index);
+      this.DueDate = original.DueDate;
+      this.Index = original.Index;
       this.Tasks = cloner.Clone(original.Tasks);
     }
@@ -48 +47 @@
       return new Job(this, cloner);
     }
-    public Job(IntValue index, DoubleValue dueDate)
+    public Job(int index, double dueDate)
       : base() {
       Index = index;
@@ -54 +53 @@
 
       if (dueDate != null)
-        DueDate = (DoubleValue)dueDate.Clone();
-      else
-        DueDate = null;
+        DueDate = dueDate;
+
     }
 
@@ -66 +64 @@
       }
       if (DueDate != null)
-        sb.Append("{" + DueDate.Value + "} ");
+        sb.Append("{" + DueDate + "} ");
       sb.Append("]");
       return sb.ToString();
@@ -72 +70 @@
 
     internal Task GetPreviousTask(Task t) {
-      if (t.TaskNr.Value == 0)
+      if (t.TaskNr == 0)
         return null;
       else
-        return Tasks[t.TaskNr.Value - 1];
+        return Tasks[t.TaskNr - 1];
     }
   }

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using HeuristicLab.Common;
@@ -39 +40 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class JobShopSchedulingProblem : SchedulingProblem {
+  public sealed class JobShopSchedulingProblem : SchedulingProblem, IStorableContent {
     #region Parameter Properties
     public ValueParameter<ItemList<Job>> JobDataParameter {
@@ -87 +88 @@
       set { DueDatesParameter.Value = value; }
     }
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
+    }
+    public string Filename { get; set; }
     #endregion
 
@@ -95 +100 @@
 
       Parameters.Add(new ValueParameter<IntValue>("Jobs", "The number of jobs used in this JSSP instance.", new IntValue()));
-      Parameters.Add(new ValueParameter<IntValue>("Resources", "The number of resources used this JSSP instance.", new IntValue()));
+      Parameters.Add(new ValueParameter<IntValue>("Resources", "The number of resources used in this JSSP instance.", new IntValue()));
       Parameters.Add(new ValueParameter<BoolValue>("DueDates", "Determines whether the problem instance uses due dates or not.", new BoolValue()));
       Parameters.Add(new ValueParameter<SchedulingEvaluator>("SolutionEvaluator", "The evaluator used to determine the quality of a solution.", new MakespanEvaluator()));
@@ -196 +201 @@
     }
     private Job CreateJobFromData(List<string> data, int jobCount) {
-      DoubleValue dueDate = null;
+      double dueDate = 0;
       int dataCount = data.Count;
       if (DueDates.Value) {
-        dueDate = new DoubleValue(Double.Parse(data[data.Count - 1]));
+        dueDate = Double.Parse(data[data.Count - 1]);
         dataCount--;
       }
-      Job j = new Job(new IntValue(jobCount), dueDate);
+      Job j = new Job(jobCount, dueDate);
       for (int i = 0; i < dataCount; i++) {
         Task t = new Task(i / 2, Int32.Parse(data[i]), jobCount, Double.Parse(data[i + 1]));

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Scheduling {
-  [Plugin("HeuristicLab.Problems.Scheduling", "3.3.3.6364")]
+  [Plugin("HeuristicLab.Problems.Scheduling", "3.3.3.6406")]
   [PluginFile("HeuristicLab.Problems.Scheduling-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabProblemsSchedulingPlugin : PluginBase {

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Task.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +30 @@
   public class Task : Item {
     [Storable]
-    public IntValue TaskNr { get; set; }
+    public int TaskNr { get; set; }
     [Storable]
-    public IntValue ResourceNr { get; set; }
+    public int ResourceNr { get; set; }
     [Storable]
-    public IntValue JobNr { get; set; }
+    public int JobNr { get; set; }
     [Storable]
-    public DoubleValue Duration { get; set; }
+    public double Duration { get; set; }
     [Storable]
-    public BoolValue IsScheduled { get; set; }
+    public bool IsScheduled { get; set; }
 
     [StorableConstructor]
@@ -45 +44 @@
     protected Task(Task original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceNr = cloner.Clone(original.ResourceNr);
-      this.JobNr = cloner.Clone(original.JobNr);
-      this.Duration = cloner.Clone(original.Duration);
-      this.TaskNr = cloner.Clone(original.TaskNr);
-      this.IsScheduled = cloner.Clone(original.IsScheduled);
+      this.ResourceNr = original.ResourceNr;
+      this.JobNr = original.JobNr;
+      this.Duration = original.Duration;
+      this.TaskNr = original.TaskNr;
+      this.IsScheduled = original.IsScheduled;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -58 +57 @@
     public Task(int taskNr, int resNr, int jobNr, double duration)
       : base() {
-      Duration = new DoubleValue(duration);
-      ResourceNr = new IntValue(resNr);
-      JobNr = new IntValue(jobNr);
-      TaskNr = new IntValue(taskNr);
-      IsScheduled = new BoolValue(false);
+      Duration = duration;
+      ResourceNr = resNr;
+      JobNr = jobNr;
+      TaskNr = taskNr;
+      IsScheduled = false;
     }