Changeset 8882 for trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

Timestamp:

11/08/12 13:31:18 (11 years ago)

Author:

abeham

Message:

#1329:

• Added JSSPData class to problem instances
• Added problem instance provider for some ORLIB JSSP instances (abz, ft, la01-20)
• Adapted JSSP to load and export jssp problems
• Adapted JSSP problem view to derive from ProblemView
• Added static methods to MakespanEvaluator and MeanTardinessEvaluator
• Fixed a bug in PRVUniformOnePositionManipulator

File:

• trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -41 +42 @@
     public MakespanEvaluator() : base() { }
 
-    protected override DoubleValue evaluate(Schedule schedule) {
-      DoubleValue quality = new DoubleValue(0);
-      foreach (Resource r in schedule.Resources) {
-        if (r.TotalDuration > quality.Value) {
-          quality.Value = r.TotalDuration;
-        }
-      }
-      return quality;
+    public static double GetMakespan(Schedule schedule) {
+      return schedule.Resources.Select(r => r.TotalDuration).Max();
+    }
+
+    protected override DoubleValue Evaluate(Schedule schedule) {
+      return new DoubleValue(GetMakespan(schedule));
     }