Changeset 13459 for branches/OptimizationNetworks

Timestamp:

12/14/15 18:06:01 (9 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

Files:

• HeuristicLab.Networks.Views/3.3/Scripting/ProgrammableItemView.cs (modified) (5 diffs)
• HeuristicLab.Networks/3.3/AlgorithmNode.cs (modified) (3 diffs)
• HeuristicLab.Networks/3.3/Core/Network.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Scripting/ProgrammableItemView.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common.Resources;
-using HeuristicLab.Core.Views;
-using HeuristicLab.MainForm;
-using HeuristicLab.PluginInfrastructure;
 using System;
 using System.CodeDom.Compiler;
@@ -29 +25 @@
 using System.Globalization;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Scripting.Views {
@@ -55 +56 @@
     }
 
-    protected override void OnContentChanged() {
+    protected async override void OnContentChanged() {
       base.OnContentChanged();
       errorsListView.Items.Clear();
@@ -63 +64 @@
       } else {
         codeEditor.UserCode = Content.Code;
-        foreach (var asm in Content.GetAssemblies())
-          codeEditor.AddAssembly(asm);
-        variableStoreView.Content = Content.VariableStore;
+        Locked = true;
+        Task t = Task.Factory.StartNew(() => {
+          foreach (var asm in Content.GetAssemblies())
+            codeEditor.AddAssembly(asm);
+          variableStoreView.Content = Content.VariableStore;
+        });
+        await t;
+        Locked = false;
       }
       ShowCompilationResults();
@@ -116 +122 @@
       try {
         Content.Compile();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         if (!(ex is InvalidOperationException) || (Content.CompileErrors == null))
           ErrorHandling.ShowErrorDialog(this, ex);

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();