diff --git a/.gitignore b/.gitignore index bdc3535..3b547dd 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ Generated_Code #added for RIA/Silverlight projects _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML +.vs/ diff --git a/CallbackFunctions/App.config b/CallbackFunctions/App.config deleted file mode 100644 index 8e15646..0000000 --- a/CallbackFunctions/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CallbackFunctions/CallbackFunctions.csproj b/CallbackFunctions/CallbackFunctions.csproj index 4e45816..e445beb 100644 --- a/CallbackFunctions/CallbackFunctions.csproj +++ b/CallbackFunctions/CallbackFunctions.csproj @@ -1,72 +1,14 @@  - - + + + - Debug - AnyCPU - {2E52A39B-3D83-41B4-907E-95BFC35C8C2F} + net472 Exe - Properties - CallbackFunctions - CallbackFunctions - v4.5 - 512 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/CallbackFunctions/Program.cs b/CallbackFunctions/Program.cs index 6994edc..213b37c 100644 --- a/CallbackFunctions/Program.cs +++ b/CallbackFunctions/Program.cs @@ -64,7 +64,7 @@ static void rdotnet_discussions_646729(REngine engine) var unixDllPath = engine.Evaluate("getLoadedDLLs()$rdotnetsamples[['path']]").AsCharacter()[0]; var dllPath = unixDllPath.Replace("/", "\\"); - var dll = new UnmanagedDll(dllPath); + var dll = new DynamicInterop.UnmanagedDll(dllPath); TestCallback cback = new TestCallback(); CallBackHandlers cbh = new CallBackHandlers(); cback.MyHandler = cbh.ProcessProgress; diff --git a/CallbackFunctions/Properties/AssemblyInfo.cs b/CallbackFunctions/Properties/AssemblyInfo.cs deleted file mode 100644 index b12db17..0000000 --- a/CallbackFunctions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CallbackFunctions")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("CallbackFunctions")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0fb94bb3-cd0a-41ac-b5be-048936544ce3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CallbackFunctions/packages.config b/CallbackFunctions/packages.config deleted file mode 100644 index e18833a..0000000 --- a/CallbackFunctions/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/HelloWorld/App.config b/HelloWorld/App.config deleted file mode 100644 index 8e15646..0000000 --- a/HelloWorld/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/HelloWorld/HelloWorld.csproj b/HelloWorld/HelloWorld.csproj index 0f0fafa..e445beb 100644 --- a/HelloWorld/HelloWorld.csproj +++ b/HelloWorld/HelloWorld.csproj @@ -1,74 +1,14 @@  - - + + + - Debug - AnyCPU - {08244E5B-EF06-41FC-B81A-D8E0415292F4} + net472 Exe - Properties - HelloWorld - HelloWorld - v4.5 - 512 - 12.0.0 - 2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/HelloWorld/Properties/AssemblyInfo.cs b/HelloWorld/Properties/AssemblyInfo.cs deleted file mode 100644 index a10bd1f..0000000 --- a/HelloWorld/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HelloWorld")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("HelloWorld")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ba742680-11cf-40d9-b1c1-246fdf7fab8a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/HelloWorld/packages.config b/HelloWorld/packages.config deleted file mode 100644 index e18833a..0000000 --- a/HelloWorld/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Optimization/Optimization.csproj b/Optimization/Optimization.csproj index 8066b11..e445beb 100644 --- a/Optimization/Optimization.csproj +++ b/Optimization/Optimization.csproj @@ -1,54 +1,14 @@  - + + + - Debug - AnyCPU - 12.0.0 - 2.0 - {B868339A-56F3-4818-BB7C-D3C53BCFF1C5} + net472 Exe - Optimization - Optimization - - true - false - bin\Debug - DEBUG; - prompt - 4 - false - - - true - bin\Release - prompt - 4 - true - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - + - + - + \ No newline at end of file diff --git a/Optimization/Program.cs b/Optimization/Program.cs index 3b2cb8c..94a03cd 100644 --- a/Optimization/Program.cs +++ b/Optimization/Program.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using RDotNet; using System.Linq; @@ -50,7 +51,7 @@ static void TestOptimCsharp(REngine engine) { x = -1 + rand.NextDouble() * (3 - (-1)); y = -1 + rand.NextDouble() * (3 - (-1)); - r = engine.Evaluate(string.Format("rosen({0}, {1})", x, y)).AsNumeric().ToArray()[0]; + r = engine.Evaluate(string.Format(CultureInfo.InvariantCulture, "rosen({0}, {1})", x, y)).AsNumeric().ToArray()[0]; if (r < rb) { rb = r; diff --git a/Optimization/Properties/AssemblyInfo.cs b/Optimization/Properties/AssemblyInfo.cs deleted file mode 100644 index e84fb93..0000000 --- a/Optimization/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Optimization")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("per202")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Optimization/packages.config b/Optimization/packages.config deleted file mode 100644 index 8816925..0000000 --- a/Optimization/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ReportInfo/App.config b/ReportInfo/App.config deleted file mode 100644 index 8e15646..0000000 --- a/ReportInfo/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ReportInfo/Program.cs b/ReportInfo/Program.cs index 94499d6..9edf9fc 100644 --- a/ReportInfo/Program.cs +++ b/ReportInfo/Program.cs @@ -14,7 +14,7 @@ static void Main(string[] args) if (args.Length > 1) rHome = args[1]; - var logInfo = NativeUtility.FindRPaths(ref rPath, ref rHome); + var logInfo = new NativeUtility(null).FindRPaths(ref rPath, ref rHome); Console.WriteLine("Is this process 64 bits? {0}", System.Environment.Is64BitProcess); Console.WriteLine(logInfo); diff --git a/ReportInfo/Properties/AssemblyInfo.cs b/ReportInfo/Properties/AssemblyInfo.cs deleted file mode 100644 index b174b05..0000000 --- a/ReportInfo/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ReportInfo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("ReportInfo")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c6e66be1-06df-46e6-aecd-3ace73bc0558")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ReportInfo/ReportInfo.csproj b/ReportInfo/ReportInfo.csproj index 29fe9ac..e445beb 100644 --- a/ReportInfo/ReportInfo.csproj +++ b/ReportInfo/ReportInfo.csproj @@ -1,73 +1,14 @@  - - + + + - Debug - AnyCPU - {1EF612BA-77C9-4E1F-A3B8-EDFF57BA230C} + net472 Exe - Properties - ReportInfo - ReportInfo - v4.5 - 512 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/ReportInfo/packages.config b/ReportInfo/packages.config deleted file mode 100644 index e18833a..0000000 --- a/ReportInfo/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sample1/App.config b/Sample1/App.config deleted file mode 100644 index 8e15646..0000000 --- a/Sample1/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Sample1/Properties/AssemblyInfo.cs b/Sample1/Properties/AssemblyInfo.cs deleted file mode 100644 index fb23eec..0000000 --- a/Sample1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sample1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("Sample1")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("23b0f3e8-b977-4124-9254-0548ca229272")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sample1/Sample1.csproj b/Sample1/Sample1.csproj index 928f254..e445beb 100644 --- a/Sample1/Sample1.csproj +++ b/Sample1/Sample1.csproj @@ -1,74 +1,14 @@  - - + + + - Debug - AnyCPU - {76547291-72A6-432F-9CD0-C07CB3E6BE35} + net472 Exe - Properties - Sample1 - Sample1 - v4.5 - 512 - 12.0.0 - 2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/Sample1/packages.config b/Sample1/packages.config deleted file mode 100644 index e18833a..0000000 --- a/Sample1/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sample2/App.config b/Sample2/App.config deleted file mode 100644 index 8e15646..0000000 --- a/Sample2/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Sample2/Properties/AssemblyInfo.cs b/Sample2/Properties/AssemblyInfo.cs deleted file mode 100644 index d4e252c..0000000 --- a/Sample2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sample2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("Sample2")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("34a47c99-c001-49ee-9bf3-0e954ecb0143")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sample2/Sample2.csproj b/Sample2/Sample2.csproj index 7e06b33..e445beb 100644 --- a/Sample2/Sample2.csproj +++ b/Sample2/Sample2.csproj @@ -1,74 +1,14 @@  - - + + + - Debug - AnyCPU - {5F32FEAE-DBD5-4650-83AC-7D9DDEC83819} + net472 Exe - Properties - Sample2 - Sample2 - v4.5 - 512 - 12.0.0 - 2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/Sample2/packages.config b/Sample2/packages.config deleted file mode 100644 index e18833a..0000000 --- a/Sample2/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/SourceRCode/App.config b/SourceRCode/App.config deleted file mode 100644 index 8e15646..0000000 --- a/SourceRCode/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/SourceRCode/Program.cs b/SourceRCode/Program.cs index be9b499..51b13f8 100644 --- a/SourceRCode/Program.cs +++ b/SourceRCode/Program.cs @@ -40,7 +40,9 @@ static void Main(string[] args) /* // if testing for http://stackoverflow.com/questions/32236596/calling-user-defined-functions-inside-a-script-in-r-net double value1 = 1, value2 = 2; - var dataframe = engine.Evaluate(string.Format("dataframe <- userDefinedFunctionOne(parameter1 = {0}, parameter2 = {1})", + var dataframe = engine.Evaluate(string.Format( + CultureInfo.InvariantCulture, + "dataframe <- userDefinedFunctionOne(parameter1 = {0}, parameter2 = {1})", value1, value2)).AsDataFrame(); // with diff --git a/SourceRCode/Properties/AssemblyInfo.cs b/SourceRCode/Properties/AssemblyInfo.cs deleted file mode 100644 index 77e99e4..0000000 --- a/SourceRCode/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SourceRCode")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("SourceRCode")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("06e53422-62d9-4496-8135-92091e7e1922")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SourceRCode/SourceRCode.csproj b/SourceRCode/SourceRCode.csproj index e4dee82..e445beb 100644 --- a/SourceRCode/SourceRCode.csproj +++ b/SourceRCode/SourceRCode.csproj @@ -1,72 +1,14 @@  - - + + + - Debug - AnyCPU - {5F1BBC34-A812-44D5-98EC-08A49E1E9FF4} + net472 Exe - Properties - SourceRCode - SourceRCode - v4.5 - 512 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/SourceRCode/packages.config b/SourceRCode/packages.config deleted file mode 100644 index e18833a..0000000 --- a/SourceRCode/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/SupportSamples/Program.cs b/SupportSamples/Program.cs index c76ff87..4a6f0f9 100644 --- a/SupportSamples/Program.cs +++ b/SupportSamples/Program.cs @@ -10,7 +10,7 @@ public static void Main (string[] args) REngine.SetEnvironmentVariables(); REngine engine = REngine.GetInstance(); //stackoverflow_27689786_2752565 (engine); - stackoverflow_27597542_2752565 (engine); + codeplex_discussion_647874(engine); // you should always dispose of the REngine properly. // After disposing of the engine, you cannot reinitialize nor reuse it engine.Dispose(); @@ -67,5 +67,23 @@ static void stackoverflow_27597542_2752565 (REngine engine) Console.WriteLine ("m$components[{0}] = {1}", i + 1, components [i]); } } + + static void codeplex_discussion_647874(REngine engine) + { + var npkscript = @" +op <- options(contrasts = c('contr.helmert', 'contr.poly')) +npk.aov <- aov(yield ~ block + N*P*K, npk) +npk.sum <- summary(npk.aov) + "; + engine.Evaluate(npkscript); + var m = engine.GetSymbol("npk.sum").AsList(); + var df = m [0].AsDataFrame(); + var names = df.Names; + var colnames = df.ColumnNames; + // should do some checkes on names + + double[] meanSqr = df["Mean Sq"].AsNumeric().ToArray(); + } + } } diff --git a/SupportSamples/Properties/AssemblyInfo.cs b/SupportSamples/Properties/AssemblyInfo.cs deleted file mode 100644 index 0e733d9..0000000 --- a/SupportSamples/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("SupportSamples")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("per202")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/SupportSamples/SupportSamples.csproj b/SupportSamples/SupportSamples.csproj index a710c10..e445beb 100644 --- a/SupportSamples/SupportSamples.csproj +++ b/SupportSamples/SupportSamples.csproj @@ -1,54 +1,14 @@  - + + + - Debug - AnyCPU - {5ED2552D-0B1F-4823-8A7E-29905F066D2C} + net472 Exe - SupportSamples - SupportSamples - v4.5 - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - - - full - true - bin\Release - prompt - 4 - true - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - + - + - + \ No newline at end of file diff --git a/SupportSamples/packages.config b/SupportSamples/packages.config deleted file mode 100644 index 78ddf81..0000000 --- a/SupportSamples/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Tutorial1/App.config b/Tutorial1/App.config deleted file mode 100644 index 8e15646..0000000 --- a/Tutorial1/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tutorial1/Properties/AssemblyInfo.cs b/Tutorial1/Properties/AssemblyInfo.cs deleted file mode 100644 index b031419..0000000 --- a/Tutorial1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Tutorial1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CSIRO")] -[assembly: AssemblyProduct("Tutorial1")] -[assembly: AssemblyCopyright("Copyright © CSIRO 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3abd1bea-5709-4a9d-b728-74b7f12ac155")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tutorial1/Tutorial1.csproj b/Tutorial1/Tutorial1.csproj index cddf39f..e445beb 100644 --- a/Tutorial1/Tutorial1.csproj +++ b/Tutorial1/Tutorial1.csproj @@ -1,74 +1,14 @@  - - + + + - Debug - AnyCPU - {2E34B44E-B7E5-411A-B4E7-D4E2FB270CFF} + net472 Exe - Properties - Tutorial1 - Tutorial1 - v4.5 - 512 - 12.0.0 - 2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\solutions\Onboard\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll - True - - - ..\solutions\Onboard\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll - True - - - - - - - - - - - - - - + - - + - - + \ No newline at end of file diff --git a/Tutorial1/packages.config b/Tutorial1/packages.config deleted file mode 100644 index e18833a..0000000 --- a/Tutorial1/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/rcpp/rdotnetsamples/DESCRIPTION b/rcpp/rdotnetsamples/DESCRIPTION index 36becfb..7f258e4 100644 --- a/rcpp/rdotnetsamples/DESCRIPTION +++ b/rcpp/rdotnetsamples/DESCRIPTION @@ -9,3 +9,4 @@ Description: An R package with sample code for R.NET documentation License: MIT Imports: Rcpp (>= 0.12.1) LinkingTo: Rcpp +Suggests: testthat