Changeset 10754 for branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/ProgrammableProblemScript.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/ProgrammableProblemScript.cs (copied) (copied from branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/ProgrammableProblemScript.cs) (4 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("ProgrammableProblemScript", "Script that defines the parameter vector and evaluates the solution.")]
+  [Item("ProgrammableProblemScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
-  public class ProgrammableProblemScript : Script, IStorableContent {
-    public string Filename { get; set; }
+  public abstract class ProgrammableProblemScript : Script {
     protected bool SuppressEvents { get; set; }
 
@@ -41 +40 @@
     public ProgrammableProblemScript() { }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ProgrammableProblemScript(this, cloner);
-    }
-
-    private volatile ProgrammableProblemBase instance;
+    private volatile ProblemBase instance;
     private object locker = new object();
-    public ProgrammableProblemBase Instance {
+    public ProblemBase Instance {
       get {
         SuppressEvents = true;
@@ -70 +65 @@
       protected set {
         instance = value;
-        OnInstanceChanged();
-      }
-    }
-
-    protected override string CodeTemplate {
-      get {
-        return @"using System;
-using System.Linq;
-using System.Collections.Generic;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Encodings.ParameterVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
-
-public class MyProblem : HeuristicLab.Problems.Programmable.ProgrammableProblemBase {
-  public MyProblem() {
-    // initialize private fields
-  }
-  public override bool IsMaximizationProblem { get { return false; } }
-  public override ParameterVector GetParametersToOptimize() {
-    return new ParameterVectorBuilder()
-      // .AddBoolean(""Parameter"")
-      // .AddInteger(""Parameter"", min: 5, max: 15, step: 3)
-      // .AddReal(""Parameter"", min: 0.0, max: 1.0)
-      // .SetPermutation(type: PermutationTypes.Absolute, length: 10)
-    .Build();
-  }
-
-  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;
-    return quality;
-  }
-
-  // implement further classes and methods
-}";
+        if (!SuppressEvents) OnInstanceChanged();
       }
     }
@@ -120 +73 @@
       var types = assembly.GetTypes();
       try {
-        instance = (ProgrammableProblemBase)Activator.CreateInstance(types.First(x => typeof(ProgrammableProblemBase).IsAssignableFrom(x)));
+        Instance = (ProblemBase)Activator.CreateInstance(types.First(x => typeof(ProblemBase).IsAssignableFrom(x)));
       } catch {
-        instance = null;
+        Instance = null;
       }
-      if (!SuppressEvents) OnInstanceChanged();
       return assembly;
     }