Changeset 14613 for branches

Timestamp:

01/26/17 15:44:04 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• fixed event handler registration

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork1.cs (modified) (2 diffs)
• HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork1.cs

@@ -64 +64 @@
       RegisterEvents();
     }
-
-    private void RegisterEvents() {
-      MetaSolver.Algorithm.ExecutionStateChanged += OnExecutionStateChanged;
-      MetaSolver.Algorithm.ExecutionTimeChanged += OnExecutionTimeChanged;
-      MetaSolver.Algorithm.Prepared += OnPrepared;
-      MetaSolver.Algorithm.Started += OnStarted;
-      MetaSolver.Algorithm.Paused += OnPaused;
-      MetaSolver.Algorithm.Stopped += OnStopped;
-      MetaSolver.Algorithm.ExceptionOccurred += OnExceptionOccurred;
-    }
-
     public LrpNetwork1() : base("LrpNetwork1") {
       var orchestratorNode = new LrpOrchestratorNode1("Orchestrator");
@@ -124 +113 @@
     }
 
+    private void RegisterEvents() {
+      MetaSolver.AlgorithmChanged += MetaSolver_AlgorithmChanged;
+      RegisterAlgorithmEvents();
+    }
+
+    private void RegisterAlgorithmEvents() {
+      var algorithm = MetaSolver.Algorithm;
+      if (algorithm == null) return;
+
+      algorithm.ExecutionStateChanged += OnExecutionStateChanged;
+      algorithm.ExecutionTimeChanged += OnExecutionTimeChanged;
+      algorithm.Prepared += OnPrepared;
+      algorithm.Started += OnStarted;
+      algorithm.Paused += OnPaused;
+      algorithm.Stopped += OnStopped;
+      algorithm.ExceptionOccurred += OnExceptionOccurred;
+    }
+
+    private void MetaSolver_AlgorithmChanged(object sender, EventArgs e) {
+      RegisterAlgorithmEvents();
+    }
+
     #region IOptimizer Members
     public RunCollection Runs { get { return MetaSolver.Algorithm.Runs; } }

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork.cs

@@ -55 +55 @@
       RegisterEvents();
     }
-    protected TtpNetwork() : base("TtpNetwork") { }
+    protected TtpNetwork() : this("TtpNetwork") { }
     protected TtpNetwork(string name) : base(name) {
       Nodes.Add(new TtpOrchestratorNode1("Orchestrator"));
@@ -72 +72 @@
     protected virtual void RegisterEvents() {
       MetaSolver.AlgorithmChanged += MetaSolver_AlgorithmChanged;
+      RegisterAlgorithmEvents();
     }
 
-    protected virtual void MetaSolver_AlgorithmChanged(object sender, EventArgs e) {
+    protected virtual void RegisterAlgorithmEvents() {
       var algorithm = MetaSolver.Algorithm;
       if (algorithm == null) return;
@@ -85 +86 @@
       algorithm.Stopped += OnStopped;
       algorithm.ExceptionOccurred += OnExceptionOccurred;
+    }
+
+    protected virtual void MetaSolver_AlgorithmChanged(object sender, EventArgs e) {
+      RegisterAlgorithmEvents();
     }