From 278388a4faf5e4337f3c67fba79a53a554e7e095 Mon Sep 17 00:00:00 2001 From: Tomas Petricek Date: Sat, 14 Nov 2015 15:13:02 +0000 Subject: [PATCH 1/2] Disable R.NET AutoPrint (fix #161 and perhaps #160) --- src/RProvider/RInit.fs | 2 +- src/RProvider/RInterop.fs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RProvider/RInit.fs b/src/RProvider/RInit.fs index da3e45f7..3eb510d7 100644 --- a/src/RProvider/RInit.fs +++ b/src/RProvider/RInit.fs @@ -116,7 +116,7 @@ let internal engine = Lazy<_>(fun () -> try Logging.logf "engine: Creating and initializing instance (sizeof=%d)" IntPtr.Size initResult.Force() |> ignore - let engine = REngine.GetInstance(null, true, null, characterDevice) + let engine = REngine.GetInstance(null, true, null, characterDevice, AutoPrint=false) System.AppDomain.CurrentDomain.DomainUnload.Add(fun _ -> engine.Dispose()) Logging.logf "engine: Created & initialized instance" engine diff --git a/src/RProvider/RInterop.fs b/src/RProvider/RInterop.fs index f49a1aeb..b0f7b290 100644 --- a/src/RProvider/RInterop.fs +++ b/src/RProvider/RInterop.fs @@ -361,7 +361,7 @@ module RInterop = | "double" | "character" | "list" | "logical" -> RValue.Value | something -> - printfn "Ignoring name %s of type %s" name something + Logging.logf "Ignoring name %s of type %s" name something RValue.Value let getPackages() : string[] = @@ -429,7 +429,7 @@ module RInterop = | "double" | "character" | "list" | "logical" -> RValue.Value | something -> - printfn "Ignoring name %s of type %s" name something + Logging.logf "Ignoring name %s of type %s" name something RValue.Value name, serializeRValue value From 9a58b833b45ea2a4f7bfb5a9690f2bc034326786 Mon Sep 17 00:00:00 2001 From: Tomas Petricek Date: Sat, 14 Nov 2015 15:17:46 +0000 Subject: [PATCH 2/2] Update release notes for v1.1.15 --- RELEASE_NOTES.md | 3 ++- src/Common/AssemblyInfo.fs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 22bf8622..013e2cc0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -26,4 +26,5 @@ * 1.1.11 - Update to R.NET 1.6.4 (support R version 2.14.1) * 1.1.12 - Include transitive dependency on DynamicInterop * 1.1.13 - Skip assembly resolution for mscorlib.resources (avoids recursive lookup error) -* 1.1.14 - Improve Liinux compatibility - try searching for libR.so (#157) \ No newline at end of file +* 1.1.14 - Improve Linux compatibility - try searching for libR.so (#157) +* 1.1.15 - Disable R.NET AutoPrint (fix #161 and perhaps #160) \ No newline at end of file diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs index 9e9bca8c..6e56a0d8 100644 --- a/src/Common/AssemblyInfo.fs +++ b/src/Common/AssemblyInfo.fs @@ -5,7 +5,7 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do ()