Changeset 11393 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/ParameterVectorMoveEvaluator.cs

Timestamp:

09/26/14 22:57:18 (10 years ago)

Author:

abeham

Message:

#2174: enabled possibility to set different problem definitions than just scripted ones

File:

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

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

@@ -43 +43 @@
     }
 
-    public ILookupParameter<SingleObjectiveScript> ScriptParameter {
-      get { return (ILookupParameter<SingleObjectiveScript>)Parameters["Script"]; }
+    public ILookupParameter<ISingleObjectiveProblemDefinitionHost> ProblemDefinitionParameter {
+      get { return (ILookupParameter<ISingleObjectiveProblemDefinitionHost>)Parameters["ProblemDefinition"]; }
     }
 
@@ -64 +64 @@
     public ParameterVectorMoveEvaluator() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new LookupParameter<SingleObjectiveScript>("Script", "The script that will execute the evaluation function and define the parameter vector."));
+      Parameters.Add(new LookupParameter<ISingleObjectiveProblemDefinitionHost>("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<DoubleValue>("Quality", "The quality of the parameter vector."));
@@ -76 +76 @@
     public override IOperation InstrumentedApply() {
       var random = RandomParameter.ActualValue;
-      var runner = ScriptParameter.ActualValue;
-      if (runner.Instance == null) throw new InvalidOperationException("Script instance is null, maybe the code doesn't compile.");
+      var host = ProblemDefinitionParameter.ActualValue;
+      if (host.Instance == null) throw new InvalidOperationException("Problem definition instance is null.");
       var config = ConfigurationParameter.ActualValue;
       var binDict = new Dictionary<string, BinaryVector>();
@@ -111 +111 @@
         realVectors: realDict.Count > 0 ? realDict : null,
         permutations: permDict.Count > 0 ? permDict : null);
-      MoveQualityParameter.ActualValue = new DoubleValue(runner.Instance.Evaluate(random, vector));
+      MoveQualityParameter.ActualValue = new DoubleValue(host.Instance.Evaluate(random, vector));
       return base.InstrumentedApply();
     }