Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Scripting

Timestamp:

05/20/15 16:41:14 (10 years ago)

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/CSharpScript.cs (deleted)
• HeuristicLab.Scripting/3.3/CSharpScriptBase.cs (deleted)
• HeuristicLab.Scripting/3.3/CompilationException.cs (copied) (copied from trunk/sources/HeuristicLab.Scripting/3.3/CompilationException.cs)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (9 diffs)
• HeuristicLab.Scripting/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (5 diffs)
• HeuristicLab.Scripting/3.3/Scripts (copied) (copied from trunk/sources/HeuristicLab.Scripting/3.3/Scripts)
• HeuristicLab.Scripting/3.3/Scripts/CSharp (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/Templates (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/Templates/ScriptTemplates.Designer.cs (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/Templates/ScriptTemplates.resx (modified) (1 prop)
• HeuristicLab.Scripting/3.3/UserScriptBase.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (4 diffs)
• HeuristicLab.Scripting/3.3/Variables.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj ¶

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Scripting</RootNamespace>
     <AssemblyName>HeuristicLab.Scripting-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -23 +23 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31 +32 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
@@ -46 +48 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
@@ -55 +58 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -64 +68 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -73 +78 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -85 +91 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CSharpScript.cs" />
+    <Compile Include="CompilationException.cs" />
+    <Compile Include="Scripts\CSharp\CSharpScript.cs" />
+    <Compile Include="Scripts\Templates\CSharpScriptTemplate.cs" />
+    <Compile Include="Scripts\Templates\ScriptTemplates.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>ScriptTemplates.resx</DependentUpon>
+    </Compile>
     <Compile Include="Variables.cs" />
     <Compile Include="VariableStore.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Script.cs" />
-    <Compile Include="CSharpScriptBase.cs" />
+    <Compile Include="Scripts\CSharp\CSharpScriptBase.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -130 +143 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Scripts\Templates\ScriptTemplates.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ScriptTemplates.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>HeuristicLab.Scripting</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-   <PropertyGroup>
+  <PropertyGroup>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/Plugin.cs.frame ¶

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 
 namespace HeuristicLab.Scripting {
-  [Plugin("HeuristicLab.Scripting", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Scripting", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Scripting-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")] 

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame ¶

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/Script.cs ¶

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -79 +79 @@
     public Script()
       : base("Script", "An empty script.") {
-      code = string.Empty;
+      code = CodeTemplate;
     }
     public Script(string code)
@@ -108 +108 @@
         WarningLevel = 4
       };
+
       parameters.ReferencedAssemblies.AddRange(
         GetAssemblies()
         .Select(a => a.Location)
         .ToArray());
-      var unit = CreateCompilationUnit();
-      var writer = new StringWriter();
-      CodeProvider.GenerateCodeFromCompileUnit(
-        unit,
-        writer,
-        new CodeGeneratorOptions {
-          ElseOnClosing = true,
-          IndentString = "  ",
-        });
-      return CodeProvider.CompileAssemblyFromDom(parameters, unit);
+
+      return CodeProvider.CompileAssemblyFromSource(parameters, code);
     }
 
@@ -134 +127 @@
             .AppendLine(error.ErrorText);
         }
-        throw new Exception(string.Format("Compilation of \"{0}\" failed:{1}{2}",
+        throw new CompilationException(string.Format("Compilation of \"{0}\" failed:{1}{2}",
           Name, Environment.NewLine, sb.ToString()));
       } else {
@@ -142 +135 @@
 
     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/HiveStatistics/sources/HeuristicLab.Scripting/3.3/UserScriptBase.cs ¶

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/VariableStore.cs ¶

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using System.IO;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Core;
@@ -32 +34 @@
   [Item("VariableStore", "Represents a variable store.")]
   [StorableClass]
-  public class VariableStore : ObservableDictionary<string, object>, IContent, IDeepCloneable {
+  public class VariableStore : ObservableDictionary<string, object>, IItem {
+    #region Properties
+    public virtual string ItemName {
+      get { return ItemAttribute.GetName(GetType()); }
+    }
+    public virtual string ItemDescription {
+      get { return ItemAttribute.GetDescription(GetType()); }
+    }
+    public Version ItemVersion {
+      get { return ItemAttribute.GetVersion(GetType()); }
+    }
+    public static Image StaticItemImage {
+      get { return VSImageLibrary.Class; }
+    }
+    public virtual Image ItemImage {
+      get { return ItemAttribute.GetImage(GetType()); }
+    }
+    #endregion
+
+    #region Constructors & Cloning
     [StorableConstructor]
     protected VariableStore(bool deserializing) : base(deserializing) { }
@@ -68 +89 @@
       }
     }
+    #endregion
+
+    #region Overrides
+    public override string ToString() {
+      return ItemName;
+    }
+    #endregion
+
+    #region Events
+    public event EventHandler ItemImageChanged;
+    protected virtual void OnItemImageChanged() {
+      var handler = ItemImageChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler ToStringChanged;
+    protected virtual void OnToStringChanged() {
+      var handler = ToStringChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    #endregion
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Scripting/3.3/Variables.cs ¶

@@ -6 +6 @@
   public class Variables : DynamicObject, IEnumerable<KeyValuePair<string, object>> {
     private readonly VariableStore variableStore;
+
+    public IEnumerable<string> Keys {
+      get { return variableStore.Keys; }
+    }
+
+    public IEnumerable<object> Values {
+      get { return variableStore.Values; }
+    }
 
     public Variables(VariableStore variableStore) {