Changeset 11396 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveEvaluator.cs

Timestamp:

09/27/14 18:30:43 (10 years ago)

Author:

abeham

Message:

#2174:

• Added analyzer operator that will call into the analyze function
• Added helper class for creating a parameter vector
• Added parameters to the interfaces and improved wiring

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveEvaluator.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
@@ -74 +69 @@
       if (host.Instance == null) throw new InvalidOperationException("Script instance is null, maybe the code doesn't compile.");
       var config = ConfigurationParameter.ActualValue;
-      var binDict = new Dictionary<string, BinaryVector>();
-      var intDict = new Dictionary<string, IntegerVector>();
-      var realDict = new Dictionary<string, RealVector>();
-      var permDict = new Dictionary<string, Permutation>();
-      foreach (var param in config.Parameters) {
-        var binConfig = param.Value as BinaryParameterConfiguration;
-        if (binConfig != null) {
-          binDict.Add(param.Key, (BinaryVector)ExecutionContext.Scope.Variables[param.Key].Value);
-          continue;
-        }
-        var intConfig = param.Value as IntegerParameterConfiguration;
-        if (intConfig != null) {
-          intDict.Add(param.Key, (IntegerVector)ExecutionContext.Scope.Variables[param.Key].Value);
-          continue;
-        }
-        var realConfig = param.Value as RealParameterConfiguration;
-        if (realConfig != null) {
-          realDict.Add(param.Key, (RealVector)ExecutionContext.Scope.Variables[param.Key].Value);
-          continue;
-        }
-        var permConfig = param.Value as PermutationParameterConfiguration;
-        if (permConfig != null) {
-          permDict.Add(param.Key, (Permutation)ExecutionContext.Scope.Variables[param.Key].Value);
-          continue;
-        }
-        throw new InvalidOperationException("Parameter " + param.Key + " not found.");
-      }
-      var vector = new ParameterVector(
-        binaryVectors: binDict.Count > 0 ? binDict : null,
-        integerVectors: intDict.Count > 0 ? intDict : null,
-        realVectors: realDict.Count > 0 ? realDict : null,
-        permutations: permDict.Count > 0 ? permDict : null);
+      var vector = Helper.Extract(ExecutionContext.Scope, config);
       QualityParameter.ActualValue = new DoubleValue(host.Instance.Evaluate(random, vector));
       return base.Apply();