Changeset 13799 for branches/OptimizationNetworks/HeuristicLab.Networks

Timestamp:

04/26/16 15:05:28 (9 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• improved network visualization

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• AlgorithmNode.cs (modified) (4 diffs)
• IAlgorithmNode.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/AlgorithmNode.cs

@@ -59 +59 @@
     }
 
+    [Storable]
+    private IItemCollection<IAlgorithm> startedAlgorithms;
+    public IItemCollection<IAlgorithm> StartedAlgorithms {
+      get { return startedAlgorithms; }
+    }
+
     [StorableConstructor]
     protected AlgorithmNode(bool deserializing) : base(deserializing) { }
@@ -65 +71 @@
       algorithm = cloner.Clone(original.algorithm);
       runs = cloner.Clone(original.runs);
+      startedAlgorithms = cloner.Clone(original.startedAlgorithms);
+      RegisterStartedAlgorithmsEvents();
     }
     public AlgorithmNode()
       : base("AlgorithmNode") {
       runs = new RunCollection();
-    }
+      startedAlgorithms = new ItemCollection<IAlgorithm>();
+      RegisterStartedAlgorithmsEvents();
+    }
+
     public AlgorithmNode(string name)
       : base(name) {
       runs = new RunCollection();
+      startedAlgorithms = new ItemCollection<IAlgorithm>();
+      RegisterStartedAlgorithmsEvents();
     }
     public AlgorithmNode(string name, string description)
       : base(name, description) {
       runs = new RunCollection();
+      startedAlgorithms = new ItemCollection<IAlgorithm>();
+      RegisterStartedAlgorithmsEvents();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new AlgorithmNode(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterStartedAlgorithmsEvents();
+    }
+
+    protected virtual void RegisterStartedAlgorithmsEvents() {
+      startedAlgorithms.ItemsAdded += StartedAlgorithms_ItemsChanged;
+      startedAlgorithms.ItemsRemoved += StartedAlgorithms_ItemsChanged;
+    }
+
+    private void StartedAlgorithms_ItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IAlgorithm> e) {
+      OnStartedAlgorithmsChanged();
     }
 
@@ -146 +175 @@
         algorithm.Prepare(true);
         algorithm.ExceptionOccurred += (sender, args) => { exception = args.Value; };
-        algorithm.Started += (sender, args) => { started.Set(); };
-        algorithm.Stopped += (sender, args) => { stopped.Set(); };
+        algorithm.Started += (sender, args) => { started.Set(); startedAlgorithms.Add((IAlgorithm)sender); };
+        algorithm.Stopped += (sender, args) => { stopped.Set(); startedAlgorithms.Remove((IAlgorithm)sender); };
         algorithm.Start();
         stopped.WaitOne();
@@ -175 +204 @@
     }
 
+    public event EventHandler StartedAlgorithmsChanged;
+    protected virtual void OnStartedAlgorithmsChanged() {
+      var handler = StartedAlgorithmsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
     #region Ports Events
     protected override void RegisterPortsEvents() {

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/IAlgorithmNode.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Networks;
 using HeuristicLab.Optimization;
-using System;
 
 namespace HeuristicLab.Networks {
@@ -29 +30 @@
     IAlgorithm Algorithm { get; set; }
     RunCollection Runs { get; }
+    IItemCollection<IAlgorithm> StartedAlgorithms { get; }
 
     event EventHandler AlgorithmChanged;
+    event EventHandler StartedAlgorithmsChanged;
   }
 }