Changeset 13422 for branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Timestamp:

11/30/15 15:12:34 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted type discovery and type selector to allow the creation of generic programmable problems.

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Files:

• MultiObjectiveProgrammableProblem.cs (modified) (3 diffs)
• SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -34 +34 @@
   [Creatable(CreatableAttribute.Categories.Problems, Priority = 120)]
   [StorableClass]
-  public abstract class MultiObjectiveProgrammableProblem<TEncoding, TSolution> : MultiObjectiveProblem<TEncoding, TSolution>, IProgrammableItem, IProgrammableProblem
+  public class MultiObjectiveProgrammableProblem<TEncoding, TSolution> : MultiObjectiveProblem<TEncoding, TSolution>, IProgrammableItem, IProgrammableProblem
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {
@@ -66 +66 @@
       RegisterEvents();
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiObjectiveProgrammableProblem<TEncoding, TSolution>(this, cloner);
+    }
+
     public MultiObjectiveProgrammableProblem()
       : base() {
@@ -71 +76 @@
         new MultiObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name }));
       ProblemScript.Encoding = (TEncoding)Encoding.Clone();
+
+      var codeTemplate = ScriptTemplates.MultiObjectiveProblem_Template;
+      codeTemplate = codeTemplate.Replace(ENCODING_NAMESPACE, typeof(TEncoding).Namespace);
+      codeTemplate = codeTemplate.Replace(ENCODING_CLASS, typeof(TEncoding).Name);
+      codeTemplate = codeTemplate.Replace(SOLUTION_CLASS, typeof(TSolution).Name);
+      ProblemScript.Code = codeTemplate;
+
       RegisterEvents();
     }

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -34 +34 @@
 namespace HeuristicLab.Problems.Programmable {
   [Item("Programmable Problem (single-objective)", "Represents a single-objective problem that can be programmed with a script.")]
+  [Creatable(CreatableAttribute.Categories.Problems, Priority = 110)]
   [StorableClass]
-  public abstract class SingleObjectiveProgrammableProblem<TEncoding, TSolution> : SingleObjectiveProblem<TEncoding, TSolution>, IProgrammableItem, IProgrammableProblem
+  public class SingleObjectiveProgrammableProblem<TEncoding, TSolution> : SingleObjectiveProblem<TEncoding, TSolution>, IProgrammableItem, IProgrammableProblem
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {
@@ -67 +68 @@
       RegisterEvents();
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SingleObjectiveProgrammableProblem<TEncoding, TSolution>(this, cloner);
+    }
+
     public SingleObjectiveProgrammableProblem()
       : base() {
-      Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>>("ProblemScript", "Defines the problem.",
-        new SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name }));
+      Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>>("ProblemScript", "Defines the problem.", new SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name }));
       ProblemScript.Encoding = (TEncoding)Encoding.Clone();
+
+      var codeTemplate = ScriptTemplates.SingleObjectiveProblem_Template;
+      codeTemplate = codeTemplate.Replace(ENCODING_NAMESPACE, typeof(TEncoding).Namespace);
+      codeTemplate = codeTemplate.Replace(ENCODING_CLASS, typeof(TEncoding).Name);
+      codeTemplate = codeTemplate.Replace(SOLUTION_CLASS, typeof(TSolution).Name);
+      ProblemScript.Code = codeTemplate;
+
       Operators.Add(new BestScopeSolutionAnalyzer());
       RegisterEvents();