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

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/Evaluators

Files:

• MeanTardinessEvaluator.cs (modified) (3 diffs)
• SchedulingEvaluationAlgorithm.cs (modified) (3 diffs)
• SchedulingEvaluator.cs (modified) (1 diff)
• SchedulingEvaluatorType.cs (deleted)
• SchedulingEvaluatorTypes.cs (deleted)

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

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Encodings.SchedulingEncoding;
+using HeuristicLab.Problems.Scheduling.Interfaces;
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {
-  [Item("Men tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
+  [Item("Mean tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
   [StorableClass]
-  public class MeanTardinessEvaluator : SchedulingEvaluator {
+  public class MeanTardinessEvaluator : SchedulingEvaluator, IJSSPOperator {
     [StorableConstructor]
     protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
@@ -46 +47 @@
 
     #region Parameter Properties
-    public ILookupParameter<ItemList<Job>> JobsParameter {
-      get { return (ILookupParameter<ItemList<Job>>)Parameters["Jobs"]; }
+    public ILookupParameter<ItemList<Job>> JobDataParameter {
+      get { return (ILookupParameter<ItemList<Job>>)Parameters["JobData"]; }
     }
     #endregion
     #region Properties
-    public ItemList<Job> Jobs {
-      get { return JobsParameter.ActualValue; }
+    public ItemList<Job> JobData {
+      get { return JobDataParameter.ActualValue; }
     }
     #endregion
 
     public MeanTardinessEvaluator() : base() {
-      Parameters.Add(new LookupParameter<ItemList<Job>>("Jobs", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
+      Parameters.Add(new LookupParameter<ItemList<Job>>("JobData", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance."));
     }
 
@@ -63 +64 @@
       double totalTardiness = 0;
       foreach (Resource r in schedule.Resources) {
-        double tardiness = r.Tasks[r.Tasks.Count - 1].EndTime.Value - Jobs[r.Tasks[r.Tasks.Count - 1].JobNr.Value].DueDate.Value;
+        double tardiness = r.Tasks[r.Tasks.Count - 1].EndTime.Value - JobData[r.Tasks[r.Tasks.Count - 1].JobNr.Value].DueDate.Value;
         if (tardiness > 0)
           totalTardiness += tardiness;

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

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {
-  [Item("Scheduling Evaluator", "Represents a general evaluator class for scheduling problems.")]
+  [Item("Scheduling Evaluation Algorithm", "Represents a composition of a decoder and an evaluator for scheduling problems.")]
   [StorableClass]
-  public class SchedulingEvaluationAlgorithm : AlgorithmOperator, ISchedulingEvaluator {
+  public class SchedulingEvaluationAlgorithm : AlgorithmOperator, ISchedulingEvaluationAlgorithm {
     [StorableConstructor]
     protected SchedulingEvaluationAlgorithm(bool deserializing) : base(deserializing) { }
     protected SchedulingEvaluationAlgorithm(SchedulingEvaluationAlgorithm original, Cloner cloner)
       : base(original, cloner) {
+        this.evaluator = cloner.Clone(original.evaluator);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SchedulingEvaluationAlgorithm(this, cloner);
     }
+
+    [Storable]
+    private Placeholder evaluator;
 
     public ILookupParameter<DoubleValue> QualityParameter {
@@ -56 +60 @@
     }
 
-    public void InitializeOperatorGraph<T>(SchedulingDecoder<T> decoder, SchedulingEvaluator evaluator) where T: Item, ISchedulingEncoding{
+    public void InitializeOperatorGraph<T>(SchedulingDecoder<T> decoder) where T: Item, ISchedulingEncoding{
       OperatorGraph.Operators.Clear();
       OperatorGraph.InitialOperator = decoder;
@@ -65 +69 @@
       : base() {
         Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value aka fitness value of the solution."));
+        evaluator = new Placeholder();
+        evaluator.OperatorParameter.ActualName = "SolutionEvaluator";
     }
 

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

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.Scheduling.Evaluators {
-  [Item("JSSP Evaluator", "Represents a evaluator class for standard job shop scheduling problems.")]
+  [Item("Scheduling Evaluator", "Represents a evaluator class for standard scheduling problems.")]
   [StorableClass]
   public abstract class SchedulingEvaluator : SingleSuccessorOperator, ISchedulingEvaluator {