Merge pull request #162 from tpetricek/master

Disable R.NET AutoPrint
fslaborg · Nov 14, 2015 · 04997e5 · 04997e5
2 parents 257930c + 9a58b83
commit 04997e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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)
+* 1.1.14 - Improve Linux compatibility - try searching for libR.so (#157)
+* 1.1.15 - Disable R.NET AutoPrint (fix #161 and perhaps #160)
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -5,7 +5,7 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("BlueMountain Capital")>]
 [<assembly: AssemblyProductAttribute("RProvider")>]
 [<assembly: AssemblyDescriptionAttribute("An F# Type Provider providing strongly typed access to the R statistical package.")>]
-[<assembly: AssemblyVersionAttribute("1.1.14")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.14")>]
+[<assembly: AssemblyVersionAttribute("1.1.15")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.15")>]
 do ()
 
diff --git 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<IntPtr>=%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
@@ -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