Changeset 10754 for branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Operators

Timestamp:

04/15/14 22:34:05 (11 years ago)

Author:

abeham

Message:

#2174: minor refactorings

File:

• branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveEvaluator.cs (moved) (moved from branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Operators/SimOptSingleObjectiveEvaluator.cs) (4 diffs)

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveEvaluator.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("SimOptSingleObjectiveEvaluator", "Evaluates a parameter vector as received from a SimOptRunner.")]
+  [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
   [StorableClass]
-  public class SimOptSingleObjectiveEvaluator : SingleSuccessorOperator, ISingleObjectiveProgrammableProblemEvaluator, IStochasticOperator {
+  public class SingleObjectiveEvaluator : SingleSuccessorOperator, ISingleObjectiveProgrammableProblemEvaluator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
@@ -39 +39 @@
     }
 
-    public ILookupParameter<ProgrammableProblemScript> ScriptParameter {
-      get { return (ILookupParameter<ProgrammableProblemScript>)Parameters["Script"]; }
+    public ILookupParameter<SingleObjectiveScript> ScriptParameter {
+      get { return (ILookupParameter<SingleObjectiveScript>)Parameters["Script"]; }
     }
 
@@ -52 +52 @@
 
     [StorableConstructor]
-    protected SimOptSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
-    protected SimOptSingleObjectiveEvaluator(SimOptSingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public SimOptSingleObjectiveEvaluator() {
+    protected SingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveEvaluator(SingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
+    public SingleObjectiveEvaluator() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new LookupParameter<ProgrammableProblemScript>("Script", "The script that will execute the evaluation function and define the parameter vector."));
+      Parameters.Add(new LookupParameter<SingleObjectiveScript>("Script", "The script that will execute the evaluation function and define the parameter vector."));
       Parameters.Add(new LookupParameter<ParameterVector>("ParameterVector", "The vector that holds the parameters."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the parameter vector."));
@@ -62 +62 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SimOptSingleObjectiveEvaluator(this, cloner);
+      return new SingleObjectiveEvaluator(this, cloner);
     }