Changeset 2933 for trunk

Timestamp:

03/05/10 06:38:53 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• corrected persistence and initialization of algorithms
• fixed SGA performance test

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.SGA/3.3/Tests/SGA.hl (modified) (previous)
• HeuristicLab.Algorithms.SGA/3.3/Tests/UnitTest.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/Tests/UnitTest.cs

@@ -93 +93 @@
     }
 
-    void sga_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+    private void sga_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       ex = e.Value;
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs

@@ -118 +118 @@
         if (t == null)
           Content.Engine = null;
-        else
+        else if ((Content.Engine == null) || (Content.Engine.GetType() != t))
           Content.Engine = (IEngine)Activator.CreateInstance(t);
       }

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -43 +43 @@
     private IProblem problem;
     [Storable]
+    private IProblem ProblemPersistence {
+      get { return problem; }
+      set {
+        if (problem != null) DeregisterProblemEvents();
+        problem = value;
+        if (problem != null) RegisterProblemEvents();
+      }
+    }
     public IProblem Problem {
       get { return problem; }

trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs

@@ -36 +36 @@
     private OperatorGraph operatorGraph;
     [Storable]
+    private OperatorGraph OperatorGraphPersistence {
+      get { return operatorGraph; }
+      set {
+        if (operatorGraph != null) operatorGraph.InitialOperatorChanged -= new EventHandler(OperatorGraph_InitialOperatorChanged);
+        operatorGraph = value;
+        if (operatorGraph != null) operatorGraph.InitialOperatorChanged += new EventHandler(OperatorGraph_InitialOperatorChanged);
+      }
+    }
     protected OperatorGraph OperatorGraph {
       get { return operatorGraph; }
@@ -58 +66 @@
     private IEngine engine;
     [Storable]
+    private IEngine EnginePersistence {
+      get { return engine; }
+      set {
+        if (engine != null) DeregisterEngineEvents();
+        engine = value;
+        if (engine != null) RegisterEngineEvents();
+      }
+    }
     public IEngine Engine {
       get { return engine; }