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

Timestamp:

05/26/11 10:25:04 (13 years ago)

Author:

jhelm

Message:

#1329: Did some heavy refactoring after "code-review meeting". Added Encodings.SchedulingEncoding plugin to store encodings used in scheduling problems.

Location:

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

Files:

• MakespanEvaluator.cs (modified) (1 diff)
• MeanTardinessEvaluator.cs (modified) (3 diffs)
• SchedulingEvaluationAlgorithm.cs (modified) (1 diff)
• SchedulingEvaluator.cs (modified) (1 diff)

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

@@ -30 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {

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

@@ -30 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.Scheduling.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {
   [Item("Men tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
   [StorableClass]
-  public class MeanTardinessEvaluator : SchedulingEvaluator, IJSSPOperator {
+  public class MeanTardinessEvaluator : SchedulingEvaluator {
     [StorableConstructor]
     protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
@@ -46 +46 @@
 
     #region Parameter Properties
-    public ILookupParameter<ItemList<JSSPJob>> JobsParameter {
-      get { return (ILookupParameter<ItemList<JSSPJob>>)Parameters["Jobs"]; }
+    public ILookupParameter<ItemList<Job>> JobsParameter {
+      get { return (ILookupParameter<ItemList<Job>>)Parameters["Jobs"]; }
     }
     #endregion
     #region Properties
-    public ItemList<JSSPJob> Jobs {
+    public ItemList<Job> Jobs {
       get { return JobsParameter.ActualValue; }
     }
@@ -57 +57 @@
 
     public MeanTardinessEvaluator() : base() {
-      Parameters.Add(new LookupParameter<ItemList<JSSPJob>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
+      Parameters.Add(new LookupParameter<ItemList<Job>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
     }
 

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

@@ -31 +31 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.Scheduling.Interfaces;
-using HeuristicLab.Problems.Scheduling.Encodings;
-using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.JobSequenceMatrix;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {

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

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using System;
-using HeuristicLab.Problems.Scheduling.Encodings;
 using HeuristicLab.Operators;
-using HeuristicLab.Problems.Scheduling.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
+using HeuristicLab.Encodings.SchedulingEncoding;