Changeset 11739 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/MultiObjectiveProblemDefinitionScript.cs

Timestamp:

01/08/15 15:52:05 (9 years ago)

Author:

mkommend

Message:

#2174: Worked on operators and programmable problem base classes and scripts.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New

Files:

• . (added)
• Scripts (added)
• Scripts/MultiObjectiveProblemDefinitionScript.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemScript.cs) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/MultiObjectiveProblemDefinitionScript.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +28 @@
   [Item("Multi-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
-  public class MultiObjectiveProblemScript : ProblemScript, IMultiObjectiveProblemDefinition, IStorableContent {
+  public class MultiObjectiveProblemDefinitionScript : ProblemDefinitionScript, IMultiObjectiveProblemDefinition, IStorableContent {
     public string Filename { get; set; }
 
@@ -45 +43 @@
 using HeuristicLab.Problems.Programmable;
 
-public class CustomProblemDefinition : ProblemScriptBase, IMultiObjectiveProblemDefinition {
+public class CustomProblemDefinition : CompiledProblemDefinition, IMultiObjectiveProblemDefinition {
   public bool[] Maximization { get { return new [] { false, false }; } }
 
@@ -98 +96 @@
 
     [StorableConstructor]
-    protected MultiObjectiveProblemScript(bool deserializing) : base(deserializing) { }
-    protected MultiObjectiveProblemScript(MultiObjectiveProblemScript original, Cloner cloner)
+    protected MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
+    protected MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner)
       : base(original, cloner) { }
 
-    public MultiObjectiveProblemScript() {
+    public MultiObjectiveProblemDefinitionScript() {
       Code = CodeTemplate;
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultiObjectiveProblemScript(this, cloner);
+      return new MultiObjectiveProblemDefinitionScript(this, cloner);
     }
 
-    public new IMultiObjectiveProblemDefinition Instance {
-      get { return (IMultiObjectiveProblemDefinition)base.Instance; }
-      protected set { base.Instance = value; }
-    }
-
-    protected override void OnInstanceChanged() {
-      OnProblemDefinitionChanged();
-      base.OnInstanceChanged();
+    public new IMultiObjectiveProblemDefinition CompiledProblemDefinition {
+      get { return (IMultiObjectiveProblemDefinition)base.CompiledProblemDefinition; }
     }
 
     bool[] IMultiObjectiveProblemDefinition.Maximization {
-      get { return Instance != null ? Instance.Maximization : new bool[0]; }
+      get { return CompiledProblemDefinition != null ? CompiledProblemDefinition.Maximization : new bool[0]; }
     }
 
-    IEncoding IProblemDefinition.Encoding {
-      get { return Instance != null ? Instance.Encoding : null; }
-    }
-
-    double[] IMultiObjectiveProblemDefinition.Evaluate(IRandom random, Individual individual) {
-      return Instance.Evaluate(random, individual);
+    double[] IMultiObjectiveProblemDefinition.Evaluate(Individual individual, IRandom random) {
+      return CompiledProblemDefinition.Evaluate(individual, random);
     }
 
     void IMultiObjectiveProblemDefinition.Analyze(Individual[] individuals, double[][] qualities, ResultCollection results) {
-      Instance.Analyze(individuals, qualities, results);
-    }
-
-    IEnumerable<Individual> IProblemDefinition.GetNeighbors(IRandom random, Individual individual) {
-      return Instance.GetNeighbors(random, individual);
-    }
-
-    public event EventHandler ProblemDefinitionChanged;
-    private void OnProblemDefinitionChanged() {
-      var handler = ProblemDefinitionChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      CompiledProblemDefinition.Analyze(individuals, qualities, results);
     }
   }