Changeset 11484 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiObjectiveEvaluator.cs

Timestamp:

10/21/14 18:49:05 (10 years ago)

Author:

abeham

Message:

#2174: Major refactoring

• Removed ProblemDefinitionHosts
• Renamed ParameterVector to Individual
• Renamed Configuration to Encoding
• Changed handling of existing operators that they will not be removed and recreated, but only rewired

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiObjectiveEvaluator.cs (modified) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiObjectiveEvaluator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("Multi-objective Evaluator", "Calls the script's Evaluate method to get the quality values of the parameter vector.")]
+  [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
   [StorableClass]
   public class MultiObjectiveEvaluator : SingleSuccessorOperator, IMultiObjectiveProgrammableProblemEvaluator, IStochasticOperator {
@@ -38 +38 @@
     }
 
-    public ILookupParameter<IMultiObjectiveProblemDefinitionHost> ProblemDefinitionParameter {
-      get { return (ILookupParameter<IMultiObjectiveProblemDefinitionHost>)Parameters["ProblemDefinition"]; }
+    public ILookupParameter<IMultiObjectiveProblemDefinition> ProblemDefinitionParameter {
+      get { return (ILookupParameter<IMultiObjectiveProblemDefinition>)Parameters["ProblemDefinition"]; }
     }
 
-    public ILookupParameter<Configuration> ConfigurationParameter {
-      get { return (ILookupParameter<Configuration>)Parameters["Configuration"]; }
+    public ILookupParameter<Encoding> EncodingParameter {
+      get { return (ILookupParameter<Encoding>)Parameters["Encoding"]; }
     }
 
@@ -55 +55 @@
     public MultiObjectiveEvaluator() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new LookupParameter<IMultiObjectiveProblemDefinitionHost>("ProblemDefinition", "The host that holds the problem definition."));
-      Parameters.Add(new LookupParameter<Configuration>("Configuration", "An item that holds the problem's configuration."));
+      Parameters.Add(new LookupParameter<IMultiObjectiveProblemDefinition>("ProblemDefinition", "The host that holds the problem definition."));
+      Parameters.Add(new LookupParameter<Encoding>("Encoding", "An item that holds the problem's encoding."));
       Parameters.Add(new LookupParameter<DoubleArray>("Qualities", "The qualities of the parameter vector."));
     }
@@ -66 +66 @@
     public override IOperation Apply() {
       var random = RandomParameter.ActualValue;
-      var host = ProblemDefinitionParameter.ActualValue;
-      if (host.Instance == null) throw new InvalidOperationException("Script instance is null, maybe the code doesn't compile.");
-      var config = ConfigurationParameter.ActualValue;
+      var definition = ProblemDefinitionParameter.ActualValue;
+      if (definition == null) throw new InvalidOperationException("Problem definition is null.");
+      var config = EncodingParameter.ActualValue;
       var vector = Helper.Extract(ExecutionContext.Scope, config);
-      QualitiesParameter.ActualValue = new DoubleArray(host.Instance.Evaluate(random, vector));
+      QualitiesParameter.ActualValue = new DoubleArray(definition.Evaluate(random, vector));
       return base.Apply();
     }