Changeset 11402 for branches

Timestamp:

09/29/14 13:27:07 (10 years ago)

Author:

abeham

Message:

#2174: cleaned up API a little

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Interfaces/IProblemDefinition.cs (modified) (1 diff)
• MultiObjectiveProblemDefinition.cs (modified) (1 diff)
• ProblemDefinition.cs (modified) (1 diff)
• ProblemDefinitionScript.cs (modified) (1 diff)
• SingleObjectiveProblemDefinition.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces/IProblemDefinition.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.Programmable {
   public interface IProblemDefinition {
-    dynamic vars { get; set; }
-    void Initialize();
     Configuration GetConfiguration();
   }

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

@@ -113 +113 @@
 
     #region Problem definition explicit interface implementations
-    dynamic IProblemDefinition.vars { get; set; }
-
-    void IProblemDefinition.Initialize() {
-
-    }
-
     Configuration IProblemDefinition.GetConfiguration() {
       return Configuration();

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

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Programmable {
   public abstract class ProblemDefinition : IProblemDefinition {
+    public abstract Configuration GetConfiguration();
+
     public dynamic vars { get; set; }
-
     public abstract void Initialize();
-    public abstract Configuration GetConfiguration();
   }
 }

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

@@ -83 +83 @@
       var types = assembly.GetTypes();
       try {
-        Instance = (IProblemDefinition)Activator.CreateInstance(types.First(x => typeof(IProblemDefinition).IsAssignableFrom(x)));
-        Instance.vars = new Variables(VariableStore);
-        Instance.Initialize();
+        var inst = (ProblemDefinition)Activator.CreateInstance(types.First(x => typeof(ProblemDefinition).IsAssignableFrom(x)));
+        inst.vars = new Variables(VariableStore);
+        inst.Initialize();
+        Instance = inst;
       } catch {
         Instance = null;

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

@@ -113 +113 @@
 
     #region Problem definition explicit interface implementations
-    dynamic IProblemDefinition.vars { get; set; }
-
-    void IProblemDefinition.Initialize() {
-
-    }
-
     Configuration IProblemDefinition.GetConfiguration() {
       return Configuration();