Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Scripting

Timestamp:

11/25/14 03:26:00 (10 years ago)

Author:

swagner

Message:

#2205: Merged changes r11062:11557 from trunk/sources into branches/OptimizationNetworks

Location:

branches/OptimizationNetworks

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/CSharpScript.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/CSharpScriptBase.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/Variables.cs (modified) (1 diff)

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

@@ -38 +38 @@
       get {
         return @"// use 'vars' to access variables in the script's variable store (e.g. vars.x = 5)
+// use 'vars[string]' to access variables via 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 script's variable store
 
 using System;
@@ -133 +135 @@
         }
       });
+      scriptThread.SetApartmentState(ApartmentState.STA);
       scriptThread.Start();
     }

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

@@ -27 +27 @@
 namespace HeuristicLab.Scripting {
   public abstract class CSharpScriptBase {
+    protected Variables variables;
     protected dynamic vars;
 
@@ -41 +42 @@
 
     internal void Execute(VariableStore variableStore) {
-      vars = new Variables(variableStore);
+      variables = vars = new Variables(variableStore);
       Main();
     }

branches/OptimizationNetworks/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -131 +131 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PropertyGroup>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
 set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd</PreBuildEvent>
+call PreBuildEvent.cmd
+</PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/OptimizationNetworks/HeuristicLab.Scripting/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Scripting {
-  [Plugin("HeuristicLab.Scripting", "3.3.9.$WCREV$")]
+  [Plugin("HeuristicLab.Scripting", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Scripting-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")] 

branches/OptimizationNetworks/HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

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

@@ -24 +24 @@
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -142 +143 @@
 
     public virtual IEnumerable<Assembly> GetAssemblies() {
-      var assemblies = new List<Assembly>();
-      foreach (var a in AppDomain.CurrentDomain.GetAssemblies()) {
-        try {
-          if (File.Exists(a.Location)) assemblies.Add(a);
-        } catch (NotSupportedException) {
-          // NotSupportedException is thrown while accessing 
-          // the Location property of the anonymously hosted
-          // dynamic methods assembly, which is related to
-          // LINQ queries
-        }
-      }
+      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;

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

@@ -45 +45 @@
             dict[kvp.Key] = CloneByPersistence(kvp.Value);
           } catch (PersistenceException pe) {
-            throw new NotSupportedException("VariableStore: Variable " + kvp.Key + " could not be cloned.", pe);
+            throw new NotSupportedException(string.Format(@"VariableStore: Variable ""{0}"" could not be cloned.", kvp.Key), pe);
           }
         }
@@ -59 +59 @@
     }
 
-    protected object CloneByPersistence(object value) {
+    protected T CloneByPersistence<T>(T value) {
       using (var serializerStream = new MemoryStream()) {
         XmlGenerator.Serialize(value, serializerStream);
         var bytes = serializerStream.GetBuffer();
         using (var deserializerStream = new MemoryStream(bytes)) {
-          return XmlParser.Deserialize<VariableStore>(deserializerStream);
+          return XmlParser.Deserialize<T>(deserializerStream);
         }
       }

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

@@ -20 +20 @@
     }
 
+    public object this[string key] {
+      get { return variableStore[key]; }
+      set { variableStore[key] = value; }
+    }
+
     public bool Contains(string variableName) {
       return variableStore.ContainsKey(variableName);