Changeset 14621 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief

Timestamp:

01/31/17 09:30:07 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added lrp network 2
• minor code changes

Location:

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

Files:

• TtpNetwork.cs (modified) (3 diffs)
• TtpNetwork1.cs (modified) (2 diffs)
• TtpNetwork2.cs (modified) (2 diffs)
• TtpNetwork3.cs (modified) (2 diffs)
• TtpOrchestratorNode.cs (modified) (1 diff)

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

@@ -31 +31 @@
   [Item("TtpNetwork", "An abstract base class for TTP optimization networks.")]
   [StorableClass]
-  public abstract class TtpNetwork : Network {
+  public abstract class TtpNetwork : Network, IOptimizer {
     #region Constants
     protected const string OrchestratorNodeName = "Orchestrator";
@@ -104 +104 @@
       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;
+      algorithm.ExecutionStateChanged += (s, e) => OnExecutionStateChanged();
+      algorithm.ExecutionTimeChanged += (s, e) => OnExecutionTimeChanged();
+      algorithm.Prepared += (s, e) => OnPrepared();
+      algorithm.Started += (s, e) => OnStarted();
+      algorithm.Paused += (s, e) => OnPaused();
+      algorithm.Stopped += (s, e) => OnStopped();
+      algorithm.ExceptionOccurred += (s, e) => OnExceptionOccurred(e.Value);
     }
 
@@ -167 +167 @@
     }
     #endregion
-
-    protected void OnExecutionStateChanged(object sender, EventArgs e) { OnExecutionStateChanged(); }
-    protected void OnExecutionTimeChanged(object sender, EventArgs e) { OnExecutionTimeChanged(); }
-    protected void OnPrepared(object sender, EventArgs e) { OnPrepared(); }
-    protected void OnStarted(object sender, EventArgs e) { OnStarted(); }
-    protected void OnPaused(object sender, EventArgs e) { OnPaused(); }
-    protected void OnStopped(object sender, EventArgs e) { OnStopped(); }
-    protected void OnExceptionOccurred(object sender, EventArgs<Exception> e) { OnExceptionOccurred(e.Value); }
   }
 }

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
   [Creatable("Optimization Networks")]
   [StorableClass]
-  public sealed class TtpNetwork1 : TtpNetwork, IOptimizer {
+  public sealed class TtpNetwork1 : TtpNetwork {
     [StorableConstructor]
     private TtpNetwork1(bool deserializing) : base(deserializing) { }

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
   [Creatable("Optimization Networks")]
   [StorableClass]
-  public sealed class TtpNetwork2 : TtpNetwork, IOptimizer {
+  public sealed class TtpNetwork2 : TtpNetwork {
     [StorableConstructor]
     private TtpNetwork2(bool deserializing) : base(deserializing) { }

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
   [Creatable("Optimization Networks")]
   [StorableClass]
-  public sealed class TtpNetwork3 : TtpNetwork, IOptimizer {
+  public sealed class TtpNetwork3 : TtpNetwork {
     [StorableConstructor]
     private TtpNetwork3(bool deserializing) : base(deserializing) { }

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

@@ -199 +199 @@
     }
 
-    protected void InstanceParameter_Value_ToStringChanged(object sender, EventArgs e) {
+    private void InstanceParameter_Value_ToStringChanged(object sender, EventArgs e) {
       string filePath = InstanceParameter.Value.Value;
       TtpUtils.Import(filePath, out tspCoordinates, out distanceType,