Changeset 11602 for branches/OptimizationNetworks

Timestamp:

11/30/14 23:25:21 (9 years ago)

Author:

swagner

Message:

#2205: Continued working on programmable network items

• added VariableStore to all programmable network items

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks/3.3/Programmable/ProgrammableNetwork.cs (modified) (1 diff)
• HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkCode.cs (modified) (2 diffs)
• HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs (modified) (9 diffs)
• HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItemCode.cs (modified) (2 diffs)
• HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs (modified) (1 diff)
• HeuristicLab.Networks/3.3/Programmable/ProgrammableNodeCode.cs (modified) (2 diffs)
• HeuristicLab.Scripting.Views/3.3/ProgrammableItemView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Scripting.Views/3.3/ProgrammableItemView.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/IProgrammableItem.cs (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetwork.cs

@@ -30 +30 @@
   [Item("ProgrammableNetwork", "Abstract base class for programmable networks.")]
   [StorableClass]
-  public abstract class ProgrammableNetwork : ProgrammableNode, IProgrammableNetwork {
+  public abstract class ProgrammableNetwork : ProgrammableNode, IProgrammableNetwork, IStorableContent {
+    #region IStorableContent Members
+    public string Filename { get; set; }
+    #endregion
+
     #region Network Members
     [Storable]

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkCode.cs

@@ -4 +4 @@
 using System;
 using System.Threading;
+
+#region How to use the variable store?
+// use "Vars" to access variables in the variable store (e.g. Vars.x = 5)
+// use "Vars[string]" to access variables using runtime strings (e.g. Vars["x"] = 5)
+// use "Vars.Contains(string)" to check if a variable exists
+// use "Vars.Clear()" to remove all variables
+// use "foreach (KeyValuePair<string, object> v in Vars) { ... }" to iterate over all variables
+// use "Variables" to work with IEnumerable<T> extension methods on the variable store
+#endregion
 
 namespace HeuristicLab.Networks.Programmable {
@@ -15 +24 @@
     }
 
-    protected override void MessagePort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+    public override void Initialize() {
+      base.Initialize();
+      // implement initialization here
+    }
+
+    protected override void ProcessMessage(IMessage message, IMessagePort port, CancellationToken token) {
       // implement processing of messages here
     }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs

@@ -24 +24 @@
 using HeuristicLab.Core.Networks;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Scripting;
 using Microsoft.CSharp;
 using System;
@@ -124 +125 @@
     public virtual bool CanChangeCode {
       get { return false; }
+    }
+    [Storable]
+    private VariableStore variableStore;
+    public VariableStore VariableStore {
+      get { return variableStore; }
     }
 
@@ -161 +167 @@
       if (original.compileErrors != null)
         compileErrors = new CompilerErrorCollection(original.compileErrors);
+      variableStore = cloner.Clone(original.variableStore);
       CompiledNetworkItem = cloner.Clone(original.compiledNetworkItem);
     }
@@ -168 +175 @@
       description = string.Empty;
       code = CodeTemplate;
+      variableStore = new VariableStore();
       Compile();
     }
@@ -175 +183 @@
       description = string.Empty;
       code = CodeTemplate;
+      variableStore = new VariableStore();
       Compile();
     }
@@ -182 +191 @@
       this.description = string.IsNullOrEmpty(description) ? string.Empty : description;
       code = CodeTemplate;
+      variableStore = new VariableStore();
       Compile();
     }
@@ -227 +237 @@
     }
     public virtual IEnumerable<Assembly> GetAssemblies() {
-      return AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.IsDynamic && File.Exists(a.Location));
+      var assemblies = AppDomain.CurrentDomain.GetAssemblies()
+        .Where(a => !a.IsDynamic && File.Exists(a.Location))
+        .ToList();
+      assemblies.Add(typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly);  // for dlr functionality
+      return assemblies;
     }
     #endregion
@@ -347 +361 @@
 
       protected ProgrammableNetworkItem Context { get; private set; }
+      private Variables variables;
+      protected Variables Variables {
+        get {
+          if (variables == null) variables = new Variables(Context.variableStore);
+          return variables;
+        }
+      }
+      protected dynamic Vars {
+        get { return Variables; }
+      }
 
       protected CompiledProgrammableNetworkItem(CompiledProgrammableNetworkItem original, Cloner cloner)
@@ -359 +383 @@
       }
 
-      public virtual void Initialize() { }
+      public virtual void Initialize() {
+        Variables.Clear();
+      }
 
       public override string ToString() {

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItemCode.cs

@@ -1 +1 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+
+#region How to use the variable store?
+// use "Vars" to access variables in the variable store (e.g. Vars.x = 5)
+// use "Vars[string]" to access variables using runtime strings (e.g. Vars["x"] = 5)
+// use "Vars.Contains(string)" to check if a variable exists
+// use "Vars.Clear()" to remove all variables
+// use "foreach (KeyValuePair<string, object> v in Vars) { ... }" to iterate over all variables
+// use "Variables" to work with IEnumerable<T> extension methods on the variable store
+#endregion
 
 namespace HeuristicLab.Networks.Programmable {
@@ -11 +20 @@
       return new MyProgrammableNetworkItem(this, cloner);
     }
+
+    public override void Initialize() {
+      base.Initialize();
+      // implement initialization here
+    }
   }
 }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs

@@ -126 +126 @@
       }
 
-      protected virtual void MessagePort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) { }
+      private void MessagePort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+        ProcessMessage(e.Value, (IMessagePort)sender, e.Value2);
+      }
+      protected virtual void ProcessMessage(IMessage message, IMessagePort port, CancellationToken token) { }
 
       #region Events

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNodeCode.cs

@@ -4 +4 @@
 using System;
 using System.Threading;
+
+#region How to use the variable store?
+// use "Vars" to access variables in the variable store (e.g. Vars.x = 5)
+// use "Vars[string]" to access variables using runtime strings (e.g. Vars["x"] = 5)
+// use "Vars.Contains(string)" to check if a variable exists
+// use "Vars.Clear()" to remove all variables
+// use "foreach (KeyValuePair<string, object> v in Vars) { ... }" to iterate over all variables
+// use "Variables" to work with IEnumerable<T> extension methods on the variable store
+#endregion
 
 namespace HeuristicLab.Networks.Programmable {
@@ -15 +24 @@
     }
 
-    protected override void MessagePort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+    public override void Initialize() {
+      base.Initialize();
+      // implement initialization here
+    }
+
+    protected override void ProcessMessage(IMessage message, IMessagePort port, CancellationToken token) {
       // implement processing of messages here
     }

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

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.codeGroupBox = new System.Windows.Forms.GroupBox();
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
@@ -61 +61 @@
       this.compilationLabel = new System.Windows.Forms.Label();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-      this.splitContainer.Panel1.SuspendLayout();
-      this.splitContainer.Panel2.SuspendLayout();
-      this.splitContainer.SuspendLayout();
+      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+      this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+      this.splitContainer2.Panel1.SuspendLayout();
+      this.splitContainer2.Panel2.SuspendLayout();
+      this.splitContainer2.SuspendLayout();
       this.codeGroupBox.SuspendLayout();
       this.errorsGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+      this.splitContainer1.Panel1.SuspendLayout();
+      this.splitContainer1.Panel2.SuspendLayout();
+      this.splitContainer1.SuspendLayout();
       this.SuspendLayout();
       // 
-      // splitContainer
-      // 
-      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer.Location = new System.Drawing.Point(0, 33);
-      this.splitContainer.Name = "splitContainer";
-      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-      // 
-      // splitContainer.Panel1
-      // 
-      this.splitContainer.Panel1.Controls.Add(this.codeGroupBox);
-      // 
-      // splitContainer.Panel2
-      // 
-      this.splitContainer.Panel2.Controls.Add(this.errorsGroupBox);
-      this.splitContainer.Size = new System.Drawing.Size(486, 454);
-      this.splitContainer.SplitterDistance = 382;
-      this.splitContainer.TabIndex = 3;
+      // splitContainer2
+      // 
+      this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer2.Name = "splitContainer2";
+      this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+      // 
+      // splitContainer2.Panel1
+      // 
+      this.splitContainer2.Panel1.Controls.Add(this.codeGroupBox);
+      // 
+      // splitContainer2.Panel2
+      // 
+      this.splitContainer2.Panel2.Controls.Add(this.errorsGroupBox);
+      this.splitContainer2.Size = new System.Drawing.Size(357, 454);
+      this.splitContainer2.SplitterDistance = 382;
+      this.splitContainer2.TabIndex = 3;
       // 
       // codeGroupBox
@@ -95 +99 @@
       this.codeGroupBox.Location = new System.Drawing.Point(0, 0);
       this.codeGroupBox.Name = "codeGroupBox";
-      this.codeGroupBox.Size = new System.Drawing.Size(486, 382);
+      this.codeGroupBox.Size = new System.Drawing.Size(357, 382);
       this.codeGroupBox.TabIndex = 0;
       this.codeGroupBox.TabStop = false;
@@ -108 +112 @@
       this.codeEditor.Name = "codeEditor";
       this.codeEditor.Prefix = "";
-      this.codeEditor.Size = new System.Drawing.Size(474, 357);
+      this.codeEditor.ReadOnly = false;
+      this.codeEditor.Size = new System.Drawing.Size(345, 357);
       this.codeEditor.Suffix = "";
       this.codeEditor.TabIndex = 0;
@@ -120 +125 @@
       this.errorsGroupBox.Location = new System.Drawing.Point(0, 0);
       this.errorsGroupBox.Name = "errorsGroupBox";
-      this.errorsGroupBox.Size = new System.Drawing.Size(486, 68);
+      this.errorsGroupBox.Size = new System.Drawing.Size(357, 68);
       this.errorsGroupBox.TabIndex = 0;
       this.errorsGroupBox.TabStop = false;
@@ -142 +147 @@
       this.errorsListView.Location = new System.Drawing.Point(6, 19);
       this.errorsListView.Name = "errorsListView";
-      this.errorsListView.Size = new System.Drawing.Size(474, 43);
+      this.errorsListView.Size = new System.Drawing.Size(345, 43);
       this.errorsListView.SmallImageList = this.imageList;
       this.errorsListView.TabIndex = 0;
@@ -200 +205 @@
       this.compilationLabel.Text = "Not compiled";
       // 
+      // splitContainer1
+      // 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.splitContainer1.Location = new System.Drawing.Point(0, 33);
+      this.splitContainer1.Name = "splitContainer1";
+      // 
+      // splitContainer1.Panel1
+      // 
+      this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+      // 
+      // splitContainer1.Panel2
+      // 
+      this.splitContainer1.Panel2.Controls.Add(this.variableStoreView);
+      this.splitContainer1.Size = new System.Drawing.Size(486, 454);
+      this.splitContainer1.SplitterDistance = 357;
+      this.splitContainer1.TabIndex = 4;
+      // 
+      // variableStoreView
+      // 
+      this.variableStoreView.Caption = "ItemCollection View";
+      this.variableStoreView.Content = null;
+      this.variableStoreView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.variableStoreView.Location = new System.Drawing.Point(0, 0);
+      this.variableStoreView.Name = "variableStoreView";
+      this.variableStoreView.ReadOnly = false;
+      this.variableStoreView.Size = new System.Drawing.Size(125, 454);
+      this.variableStoreView.TabIndex = 0;
+      // 
       // ProgrammableItemView
       // 
+      this.Controls.Add(this.splitContainer1);
       this.Controls.Add(this.compilationLabel);
       this.Controls.Add(this.compileButton);
-      this.Controls.Add(this.splitContainer);
       this.Name = "ProgrammableItemView";
       this.Size = new System.Drawing.Size(486, 487);
-      this.splitContainer.Panel1.ResumeLayout(false);
-      this.splitContainer.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-      this.splitContainer.ResumeLayout(false);
+      this.splitContainer2.Panel1.ResumeLayout(false);
+      this.splitContainer2.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+      this.splitContainer2.ResumeLayout(false);
       this.codeGroupBox.ResumeLayout(false);
       this.errorsGroupBox.ResumeLayout(false);
+      this.splitContainer1.Panel1.ResumeLayout(false);
+      this.splitContainer1.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+      this.splitContainer1.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -220 +259 @@
     #endregion
 
-    protected System.Windows.Forms.SplitContainer splitContainer;
+    protected System.Windows.Forms.SplitContainer splitContainer2;
     protected System.Windows.Forms.GroupBox errorsGroupBox;
     protected System.Windows.Forms.Button compileButton;
@@ -235 +274 @@
     protected System.Windows.Forms.GroupBox codeGroupBox;
     protected System.Windows.Forms.ToolTip toolTip;
+    protected System.Windows.Forms.SplitContainer splitContainer1;
+    protected VariableStoreView variableStoreView;
 
   }

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

@@ -60 +60 @@
       if (Content == null) {
         codeEditor.UserCode = string.Empty;
+        variableStoreView.Content = null;
       } else {
         codeEditor.UserCode = Content.Code;
         foreach (var asm in Content.GetAssemblies())
           codeEditor.AddAssembly(asm);
+        variableStoreView.Content = Content.VariableStore;
       }
       ShowCompilationResults();
@@ -74 +76 @@
       codeEditor.Enabled = Content != null && !Locked;
       codeEditor.ReadOnly = ReadOnly || Locked || ((Content != null) && !Content.CanChangeCode);
+      variableStoreView.ReadOnly = (Content != null) && !Content.CanChangeCode;
     }
 

branches/OptimizationNetworks/HeuristicLab.Scripting/3.3/IProgrammableItem.cs

@@ -31 +31 @@
     CompilerErrorCollection CompileErrors { get; }
     bool CanChangeCode { get; }
+    VariableStore VariableStore { get; }
 
     void Compile();