Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs

@@ -28 +28 @@
   [Item("Multi-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
-  public class MultiObjectiveProblemDefinitionScript : ProblemDefinitionScript, IMultiObjectiveProblemDefinition, IStorableContent {
+  public sealed class MultiObjectiveProblemDefinitionScript : ProblemDefinitionScript, IMultiObjectiveProblemDefinition, IStorableContent {
     public string Filename { get; set; }
-
-    protected override string CodeTemplate {
-      get { return ScriptTemplates.CompiledMultiObjectiveProblemDefinition; }
-    }
 
     private new IMultiObjectiveProblemDefinition CompiledProblemDefinition {
@@ -40 +36 @@
 
     [StorableConstructor]
-    protected MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
-    protected MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner)
-      : base(original, cloner) { }
-
-    public MultiObjectiveProblemDefinitionScript() {
-      Code = CodeTemplate;
-    }
+    private MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
+    private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
+    public MultiObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledMultiObjectiveProblemDefinition) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -71 +71 @@
     private void RegisterEvents() {
       ProblemScript.ProblemDefinitionChanged += (o, e) => OnProblemDefinitionChanged();
+      ProblemScript.NameChanged += (o, e) => OnProblemScriptNameChanged();
     }
 
@@ -80 +81 @@
       OnOperatorsChanged();
       OnReset();
+    }
+    protected override void OnNameChanged() {
+      base.OnNameChanged();
+      ProblemScript.Name = Name;
+    }
+    private void OnProblemScriptNameChanged() {
+      Name = ProblemScript.Name;
     }
 

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  [Plugin("HeuristicLab.Problems.Programmable", "Programmable problem for defining custom representation and evaluation function.", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.Programmable", "Programmable problem for defining custom representation and evaluation function.", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Programmable-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

@@ -53 +53 @@
     protected ProblemDefinitionScript()
       : base() {
+      variableStore = new VariableStore();
+    }
+    protected ProblemDefinitionScript(string code)
+      : base(code) {
       variableStore = new VariableStore();
     }

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs

@@ -32 +32 @@
     public string Filename { get; set; }
 
-    protected override string CodeTemplate {
-      get { return ScriptTemplates.CompiledSingleObjectiveProblemDefinition; }
-    }
-
     private new ISingleObjectiveProblemDefinition CompiledProblemDefinition {
       get { return (ISingleObjectiveProblemDefinition)base.CompiledProblemDefinition; }
@@ -43 +39 @@
     private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveProblemDefinitionScript()
-      : base() {
-      Code = CodeTemplate;
-    }
+    public SingleObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledSingleObjectiveProblemDefinition) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/crossvalidation-2434/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -74 +74 @@
     private void RegisterEvents() {
       ProblemScript.ProblemDefinitionChanged += (o, e) => OnProblemDefinitionChanged();
+      ProblemScript.NameChanged += (o, e) => OnProblemScriptNameChanged();
     }
 
@@ -83 +84 @@
       OnOperatorsChanged();
       OnReset();
+    }
+    protected override void OnNameChanged() {
+      base.OnNameChanged();
+      ProblemScript.Name = Name;
+    }
+    private void OnProblemScriptNameChanged() {
+      Name = ProblemScript.Name;
     }