Changeset 694 for trunk

Timestamp:

10/19/08 02:11:33 (16 years ago)

Author:

gkronber

Message:

fixed #315 (Support for LINQ extensions in ProgrammableOperator)

Location:

trunk/sources/HeuristicLab.Operators.Programmable

Files:

• HeuristicLab.Operators.Programmable.csproj (modified) (3 diffs)
• ProgrammableOperator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/HeuristicLab.Operators.Programmable.csproj

@@ -3 +3 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E3CCBFC6-900C-41B6-AFB8-6646DB097435}</ProjectGuid>
@@ -17 +17 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -55 +56 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />

trunk/sources/HeuristicLab.Operators.Programmable/ProgrammableOperator.cs

@@ -25 +25 @@
 using System.Xml;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.CodeDom;
@@ -32 +33 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using System.Data.Linq;
 
 namespace HeuristicLab.Operators.Programmable {
@@ -56 +58 @@
       myCode = "Result.Data = true;";
       myDescription = "An operator that can be programmed for arbitrary needs.";
-
       AddVariableInfo(new VariableInfo("Result", "A computed variable", typeof(BoolData), VariableKind.New | VariableKind.Out));
       executeMethod = null;
@@ -94 +95 @@
       ns.Imports.Add(new CodeNamespaceImport("System.Text"));
       ns.Imports.Add(new CodeNamespaceImport("System.Linq"));
+      ns.Imports.Add(new CodeNamespaceImport("System.Data.Linq"));
       ns.Imports.Add(new CodeNamespaceImport("HeuristicLab.Core"));
       foreach (IVariableInfo variableInfo in VariableInfos)
@@ -107 +109 @@
       foreach (Assembly loadedAssembly in loadedAssemblies)
         parameters.ReferencedAssemblies.Add(loadedAssembly.Location);
-      CodeDomProvider provider = new CSharpCodeProvider();
+      parameters.ReferencedAssemblies.Add(typeof(Enumerable).Assembly.Location); // add reference to version 3.5 of System.dll
+      parameters.ReferencedAssemblies.Add(typeof(DataContext).Assembly.Location); // add reference System.Data.Linq.Dll
+      CodeDomProvider provider = new CSharpCodeProvider(new Dictionary<string, string>() { { "CompilerVersion", "v3.5" } });  // support C# 3.0 syntax
       CompilerResults results = provider.CompileAssemblyFromDom(parameters, unit);