Changeset 11397 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

Timestamp:

09/28/14 09:18:30 (10 years ago)

Author:

abeham

Message:

#2174:

• Renamed methods from e.g. Configuration.AddReal to Configuration.AddRealVector
• Introduced the variable store into the single-objective problem definition script
• Created a base class for problem definitions that are derived from in code
• Created a view for problem definition scripts that also includes the variable store
  • It looks like a C# script view, but unfortunately, the content types are not compatible

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

@@ -34 +34 @@
     protected bool SuppressEvents { get; set; }
 
+    [Storable]
+    private VariableStore variableStore;
+    public VariableStore VariableStore {
+      get { return variableStore; }
+    }
+
     [StorableConstructor]
     protected ProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     protected ProblemDefinitionScript(ProblemDefinitionScript original, Cloner cloner)
-      : base(original, cloner) { }
-    public ProblemDefinitionScript() { }
+      : base(original, cloner) {
+      variableStore = cloner.Clone(original.variableStore);
+    }
+    protected ProblemDefinitionScript() {
+      variableStore = new VariableStore();
+    }
 
     private volatile IProblemDefinition instance;
@@ -74 +84 @@
       try {
         Instance = (IProblemDefinition)Activator.CreateInstance(types.First(x => typeof(IProblemDefinition).IsAssignableFrom(x)));
+        Instance.vars = new Variables(VariableStore);
+        Instance.Initialize();
       } catch {
         Instance = null;