Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable R.NET AutoPrint #162

Merged
merged 2 commits into from
Nov 14, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions src/Common/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -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 ()

2 changes: 1 addition & 1 deletion src/RProvider/RInit.fs
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/RProvider/RInterop.fs
Original file line number Diff line number Diff line change
@@ -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