Changeset 6406 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluationAlgorithm.cs

Timestamp:

06/10/11 16:18:44 (13 years ago)

Author:

jhelm

Message:

#1329: Applied suggestions from codereview. Added unit-tests. Renamed encoding-project.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Files:

• . (modified) (1 prop)
• Evaluators/SchedulingEvaluationAlgorithm.cs (modified) (3 diffs)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.Operators;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
-using HeuristicLab.Encodings.SchedulingEncoding.Interfaces;
-using HeuristicLab.Encodings.SchedulingEncoding;
 
-namespace HeuristicLab.Problems.Scheduling.Evaluators {
+namespace HeuristicLab.Problems.Scheduling {
   [Item("Scheduling Evaluation Algorithm", "Represents a composition of a decoder and an evaluator for scheduling problems.")]
   [StorableClass]
-  public class SchedulingEvaluationAlgorithm : AlgorithmOperator, ISchedulingEvaluationAlgorithm {
+  public class SchedulingEvaluationAlgorithm : AlgorithmOperator, IScheduleEvaluationAlgorithm {
     [StorableConstructor]
     protected SchedulingEvaluationAlgorithm(bool deserializing) : base(deserializing) { }
     protected SchedulingEvaluationAlgorithm(SchedulingEvaluationAlgorithm original, Cloner cloner)
       : base(original, cloner) {
-        this.evaluator = cloner.Clone(original.evaluator);
+      this.evaluator = cloner.Clone(original.evaluator);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -60 +54 @@
     }
 
-    public void InitializeOperatorGraph<T>(SchedulingDecoder<T> decoder) where T: Item, ISchedulingEncoding{
+    public void InitializeOperatorGraph<T>(ScheduleDecoder<T> decoder) where T : Item, IScheduleEncoding {
       OperatorGraph.Operators.Clear();
       OperatorGraph.InitialOperator = decoder;
@@ -68 +62 @@
     public SchedulingEvaluationAlgorithm()
       : base() {
-        Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value aka fitness value of the solution."));
-        evaluator = new Placeholder();
-        evaluator.OperatorParameter.ActualName = "SolutionEvaluator";
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value aka fitness value of the solution."));
+      evaluator = new Placeholder();
+      evaluator.OperatorParameter.ActualName = "SolutionEvaluator";
     }
 

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Problems.Scheduling-3.3.csproj.user