Changeset 6260 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators

Timestamp:

05/24/11 09:47:24 (14 years ago)

Author:

jhelm

Message:

#1329: Implemented PermutationWithRepetition Encoding. Implemented new operators for JSM Encoding.

Location:

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

Files:

• JSSPEvaluationAlgorithm.cs (added)
• JSSPEvaluator.cs (modified) (2 diffs)
• MakespanEvaluator.cs (modified) (1 diff)
• SchedulingEvaluator.cs (deleted)

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

@@ -32 +32 @@
 using HeuristicLab.Problems.Scheduling.Encodings;
 using HeuristicLab.Operators;
+using HeuristicLab.Problems.Scheduling.Interfaces;
 
 
@@ -37 +38 @@
   [Item("JSSP Evaluator", "Represents a evaluator class for standard job shop scheduling problems.")]
   [StorableClass]
-  public abstract class JSSPEvaluator : JSSPOperator, ISingleObjectiveEvaluator {
+  public abstract class JSSPEvaluator : JSSPOperator, ISchedulingEvaluator {
     [StorableConstructor]
     protected JSSPEvaluator(bool deserializing) : base(deserializing) { }

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

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