Changeset 13459 for branches/OptimizationNetworks/HeuristicLab.Networks

Timestamp:

12/14/15 18:06:01 (8 years ago)

Author:

ascheibe

Message:

#2205

• fixed another deserialization bug
• AlgorithmNode: made locker object protected so that inherited classes that override the Execute method can use it
• Improved responsiveness of ProgrammableItemView

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• AlgorithmNode.cs (modified) (3 diffs)
• Core/Network.cs (modified) (2 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 
 namespace HeuristicLab.Networks {
@@ -35 +35 @@
   [StorableClass]
   public class AlgorithmNode : Node, IAlgorithmNode {
-    private object locker = new object();
+    protected object locker = new object();
 
     new public PortCollection Ports {

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/Network.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core.Networks {
@@ -84 +84 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      foreach (var n in Nodes)
+      foreach (var n in Nodes.ToList())
         n.Parent = this;
       RegisterNodesEvents();