Changeset 10754 for branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveScript.cs

Timestamp:

04/15/14 22:34:05 (11 years ago)

Author:

abeham

Message:

#2174: minor refactorings

File:

• branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveScript.cs (copied) (copied from branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/ProgrammableProblemScript.cs) (4 diffs)

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveScript.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Linq;
-using System.Reflection;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Scripting;
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("ProgrammableProblemScript", "Script that defines the parameter vector and evaluates the solution.")]
+  [Item("Single-objective Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
-  public class ProgrammableProblemScript : Script, IStorableContent {
+  public class SingleObjectiveScript : ProgrammableProblemScript, IStorableContent {
     public string Filename { get; set; }
-    protected bool SuppressEvents { get; set; }
 
     [StorableConstructor]
-    protected ProgrammableProblemScript(bool deserializing) : base(deserializing) { }
-    protected ProgrammableProblemScript(ProgrammableProblemScript original, Cloner cloner)
+    protected SingleObjectiveScript(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveScript(SingleObjectiveScript original, Cloner cloner)
       : base(original, cloner) { }
-    public ProgrammableProblemScript() { }
+    public SingleObjectiveScript() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ProgrammableProblemScript(this, cloner);
+      return new SingleObjectiveScript(this, cloner);
     }
 
-    private volatile ProgrammableProblemBase instance;
-    private object locker = new object();
-    public ProgrammableProblemBase Instance {
-      get {
-        SuppressEvents = true;
-        try {
-          var oldInstance = instance;
-          var compilationNecessary = false;
-          if (instance == null) {
-            lock (locker) {
-              if (instance == null) {
-                compilationNecessary = true;
-                Compile();
-              }
-            }
-          }
-          if (compilationNecessary && (oldInstance != null || instance != null))
-            OnInstanceChanged();
-          return instance;
-        } finally {
-          SuppressEvents = false;
-        }
-      }
-      protected set {
-        instance = value;
-        OnInstanceChanged();
-      }
+    public new SingleObjectiveProblemBase Instance {
+      get { return (SingleObjectiveProblemBase)base.Instance; }
+      protected set { base.Instance = value; }
     }
 
@@ -85 +56 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 
-public class MyProblem : HeuristicLab.Problems.Programmable.ProgrammableProblemBase {
+public class MyProblem : HeuristicLab.Problems.Programmable.SingleObjectiveProblemBase {
   public MyProblem() {
     // initialize private fields
@@ -99 +70 @@
   }
 
-  public override void EvaluateFeasibility(ParameterVector vector) {
-    vector.IsFeasible = true
-    // && vector.Integer(""Parameter1"") < vector.Integer(""Parameter2"");
-    // && (vector.Real(""Parameter3"") >= 1.0 || (vector.Real(""Parameter3"") < 1.0 && vector.Integer(""Parameter1"") < 5));
-    ;
-  }
-
   public override double Evaluate(IRandom random, ParameterVector vector) {
     var quality = 0.0;
+    // quality = vector.Boolean(""Parameter"") ? vector.Real(""Parameter"") : vector.Integer(""Parameter"");
     return quality;
   }
@@ -115 +80 @@
       }
     }
-
-    public override Assembly Compile() {
-      var assembly = base.Compile();
-      var types = assembly.GetTypes();
-      try {
-        instance = (ProgrammableProblemBase)Activator.CreateInstance(types.First(x => typeof(ProgrammableProblemBase).IsAssignableFrom(x)));
-      } catch {
-        instance = null;
-      }
-      if (!SuppressEvents) OnInstanceChanged();
-      return assembly;
-    }
-
-    protected override void OnCodeChanged() {
-      base.OnCodeChanged();
-      instance = null;
-    }
-
-    public event EventHandler InstanceChanged;
-    protected void OnInstanceChanged() {
-      var handler = InstanceChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
   }
 }