Changeset 11739 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/SingleObjectiveProblemDefinitionScript.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/SingleObjectiveProblemDefinitionScript.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemScript.cs) (3 diffs)

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

@@ -30 +30 @@
   [Item("Single-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
-  public sealed class SingleObjectiveProblemScript : ProblemScript, ISingleObjectiveProblemDefinition, IStorableContent {
+  public sealed class SingleObjectiveProblemDefinitionScript : ProblemDefinitionScript, ISingleObjectiveProblemDefinition, IStorableContent {
     public string Filename { get; set; }
 
@@ -45 +45 @@
 using HeuristicLab.Problems.Programmable;
 
-public class CustomProblemDefinition : ProblemScriptBase, ISingleObjectiveProblemDefinition {
+public class CustomProblemDefinition : CompiledProblemDefinition, ISingleObjectiveProblemDefinition {
   public bool IsMaximizationProblem { get { return false; } }
 
@@ -98 +98 @@
 
     [StorableConstructor]
-    private SingleObjectiveProblemScript(bool deserializing) : base(deserializing) { }
-    private SingleObjectiveProblemScript(SingleObjectiveProblemScript original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveProblemScript() {
+    private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
+    private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
+    public SingleObjectiveProblemDefinitionScript() :base(){
       Code = CodeTemplate;
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SingleObjectiveProblemScript(this, cloner);
+      return new SingleObjectiveProblemDefinitionScript(this, cloner);
     }
 
-    public new ISingleObjectiveProblemDefinition Instance {
-      get { return (ISingleObjectiveProblemDefinition)base.Instance; }
-      private set { base.Instance = value; }
+    public new ISingleObjectiveProblemDefinition CompiledProblemDefinition {
+      get { return (ISingleObjectiveProblemDefinition)base.CompiledProblemDefinition; }
     }
 
-    protected override void OnInstanceChanged() {
-      OnProblemDefinitionChanged();
-      base.OnInstanceChanged();
+    bool ISingleObjectiveProblemDefinition.Maximization {
+      get { return CompiledProblemDefinition != null && CompiledProblemDefinition.Maximization; }
     }
 
-    bool ISingleObjectiveProblemDefinition.IsMaximizationProblem {
-      get { return Instance != null && Instance.IsMaximizationProblem; }
-    }
-
-    IEncoding IProblemDefinition.Encoding {
-      get { return Instance != null ? Instance.Encoding : null; }
-    }
-
-    double ISingleObjectiveProblemDefinition.Evaluate(IRandom random, Individual individual) {
-      return Instance.Evaluate(random, individual);
+    double ISingleObjectiveProblemDefinition.Evaluate(Individual individual, IRandom random) {
+      return CompiledProblemDefinition.Evaluate(individual, random);
     }
 
     void ISingleObjectiveProblemDefinition.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);
     }
   }