Changeset 11484 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiObjectiveAnalyzer.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/MultiObjectiveAnalyzer.cs (modified) (4 diffs)

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

@@ -11 +11 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("Multi-objective Analyzer", "Calls the script's Analyze method to be able to write into the results collection.")]
+  [Item("Multi-objective Analyzer", "Calls the Analyze method of the problem definition.")]
   [StorableClass]
   public class MultiObjectiveAnalyzer : SingleSuccessorOperator, IMultiObjectiveProgrammableProblemAnalyzer {
     public bool EnabledByDefault { get { return true; } }
 
-    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"]; }
     }
 
@@ -37 +37 @@
     public MultiObjectiveAnalyzer() {
       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 ScopeTreeLookupParameter<DoubleArray>("Qualities", "The qualities of the parameter vector."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The results collection to write to."));
@@ -48 +48 @@
 
     public override IOperation Apply() {
-      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 results = ResultsParameter.ActualValue;
 
@@ -58 +58 @@
 
       var vectors = scopes.Select(scope => Helper.Extract(scope, config)).ToArray();
-      host.Instance.Analyze(vectors, QualitiesParameter.ActualValue.Select(x => x.ToArray()).ToArray(), results);
+      definition.Analyze(vectors, QualitiesParameter.ActualValue.Select(x => x.ToArray()).ToArray(), results);
       return base.Apply();
     }