Changeset 14610 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork2.cs

Timestamp:

01/26/17 14:12:39 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added abstract base classes for ttp networks/orchestrators
• removed ttp networks/orchestrators from HeuristicLab.Networks.IntegratedOptimization
• runs can now be cleared when preparing OrchestratedAlgorithmNodes

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork2.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using HeuristicLab.Algorithms.CMAEvolutionStrategy;
 using HeuristicLab.Algorithms.LocalSearch;
@@ -27 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Core.Networks;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -35 +32 @@
   [Creatable("Optimization Networks")]
   [StorableClass]
-  public sealed class TtpNetwork2 : Network, IOptimizer {
-    #region Nodes
-    public TtpOrchestratorNode2 Orchestrator {
-      get { return (TtpOrchestratorNode2)Nodes["Orchestrator"]; }
-    }
-
-    public OrchestratedAlgorithmNode MetaSolver {
-      get { return (OrchestratedAlgorithmNode)Nodes["MetaSolver"]; }
-    }
-
-    public OrchestratedAlgorithmNode TspSolver {
-      get { return (OrchestratedAlgorithmNode)Nodes["TspSolver"]; }
-    }
-
-    public OrchestratedAlgorithmNode KspSolver {
-      get { return (OrchestratedAlgorithmNode)Nodes["KspSolver"]; }
-    }
-    #endregion
-
+  public sealed class TtpNetwork2 : TtpNetwork, IOptimizer {
     [StorableConstructor]
     private TtpNetwork2(bool deserializing) : base(deserializing) { }
-    private TtpNetwork2(TtpNetwork2 original, Cloner cloner) : base(original, cloner) {
-      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 TtpNetwork2() : base("TtpNetwork2") {
-      var orchestratorNode = new TtpOrchestratorNode2("Orchestrator");
-      Nodes.Add(orchestratorNode);
-
-      var metaSolverNode = new OrchestratedAlgorithmNode("MetaSolver");
+    private TtpNetwork2(TtpNetwork2 original, Cloner cloner) : base(original, cloner) { }
+    public TtpNetwork2() : this("TtpNetwork2") { }
+    public TtpNetwork2(string name) : base(name) {
       var cmaes = new CMAEvolutionStrategy();
       cmaes.Problem = new VariegationProblem();
       cmaes.MaximumGenerations = 80;
-      metaSolverNode.Algorithm = cmaes;
-      orchestratorNode.MetaSolverOrchestrationPort.ConnectedPort = metaSolverNode.OrchestrationPort;
-      Nodes.Add(metaSolverNode);
+      MetaSolver.Algorithm = cmaes;
+      Orchestrator.MetaSolverOrchestrationPort.ConnectedPort = MetaSolver.OrchestrationPort;
 
-      var tspSolverNode = new OrchestratedAlgorithmNode("TspSolver");
       var ls = new LocalSearch();
-      ls.Problem = orchestratorNode.KspParameter.Value;
+      ls.Problem = Orchestrator.KspParameter.Value;
       ls.MaximumIterations.Value = 100;
       ls.SampleSize.Value = 2000;
-      tspSolverNode.Algorithm = ls;
-      orchestratorNode.TspSolverOrchestrationPort.ConnectedPort = tspSolverNode.OrchestrationPort;
-      Nodes.Add(tspSolverNode);
+      TspSolver.Algorithm = ls;
+      Orchestrator.TspSolverOrchestrationPort.ConnectedPort = TspSolver.OrchestrationPort;
 
-      var kspSolverNode = new OrchestratedAlgorithmNode("KspSolver");
       var p3 = new ParameterlessPopulationPyramid();
       p3.Problem = new LootProfitProblem();
       p3.MaximumRuntime = 3;
-      kspSolverNode.Algorithm = p3;
-      orchestratorNode.KspSolverOrchestrationPort.ConnectedPort = kspSolverNode.OrchestrationPort;
-      Nodes.Add(kspSolverNode);
-
-      RegisterEvents();
+      KspSolver.Algorithm = p3;
+      Orchestrator.KspSolverOrchestrationPort.ConnectedPort = KspSolver.OrchestrationPort;
     }
 
@@ -105 +61 @@
       return new TtpNetwork2(this, cloner);
     }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEvents();
-    }
-
-    #region IOptimizer Members
-    public RunCollection Runs { get { return MetaSolver.Algorithm.Runs; } }
-    public IEnumerable<IOptimizer> NestedOptimizers { get { yield break; } }
-    public ExecutionState ExecutionState { get { return MetaSolver.Algorithm.ExecutionState; } }
-    public TimeSpan ExecutionTime { get { return MetaSolver.Algorithm.ExecutionTime; } }
-
-    public void Prepare(bool clearRuns) { Prepare(); }
-    public void Prepare() { Orchestrator.Prepare(); }
-    public void Start() {
-      if (MetaSolver.Algorithm.ExecutionState == ExecutionState.Prepared)
-        Orchestrator.Prepare();
-      Orchestrator.StartAsync();
-    }
-    public void Pause() { Orchestrator.Pause(); }
-    public void Stop() { Orchestrator.Stop(); }
-    #endregion
-
-    private void OnExecutionStateChanged(object sender, EventArgs e) { OnExecutionStateChanged(); }
-    private void OnExecutionTimeChanged(object sender, EventArgs e) { OnExecutionTimeChanged(); }
-    private void OnPrepared(object sender, EventArgs e) { OnPrepared(); }
-    private void OnStarted(object sender, EventArgs e) { OnStarted(); }
-    private void OnPaused(object sender, EventArgs e) { OnPaused(); }
-    private void OnStopped(object sender, EventArgs e) { OnStopped(); }
-    private void OnExceptionOccurred(object sender, EventArgs<Exception> e) { OnExceptionOccurred(e.Value); }
-
-    public event EventHandler ExecutionStateChanged;
-    private void OnExecutionStateChanged() {
-      var handler = ExecutionStateChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler ExecutionTimeChanged;
-    private void OnExecutionTimeChanged() {
-      var handler = ExecutionTimeChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler Prepared;
-    private void OnPrepared() {
-      var handler = Prepared;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler Started;
-    private void OnStarted() {
-      var handler = Started;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler Paused;
-    private void OnPaused() {
-      var handler = Paused;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler Stopped;
-    private void OnStopped() {
-      var handler = Stopped;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
-    private void OnExceptionOccurred(Exception exception) {
-      var handler = ExceptionOccurred;
-      if (handler != null) handler(this, new EventArgs<Exception>(exception));
-    }
   }
 }