updated jvm and figure_windows arguments

.Rbuildignore

@@ -8,3 +8,4 @@
 ^README-.*\.png$
 ^cran-comments\.md$
 ^CONDUCT\.md$
+^README\.html$

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: matlabr
 Type: Package
 Title: An Interface for MATLAB using System Calls
-Version: 1.5.2
-Date: 2018-08-13
+Version: 1.6.0
+Date: 2020-07-01
 Authors@R: person(given = "John",
            family = "Muschelli",
            role = c("aut", "cre"),
@@ -17,5 +17,5 @@ License: GPL-2
 Encoding: UTF-8
 SystemRequirements: MATLAB
 BugReports: https://github.com/muschellij2/matlabr/issues
-RoxygenNote: 6.1.0
+RoxygenNote: 7.1.0
 Suggests: covr

NEWS.md

@@ -1,3 +1,7 @@
+# CHANGES IN matlabr VERSION 1.6.0
+
+- Added `jvm` and `figure_windows` arguments.
+
 # CHANGES IN matlabr VERSION 1.5.2
 
 - Added single threaded mode in `run_matlab_script`.

R/matlab_script.R

@@ -12,6 +12,10 @@
 #' passed to \code{\link{system}} and adds the \code{-wait} flag.
 #' @param single_thread Should the flag \code{-singleCompThread} 
 #' be executed to limit MATLAB to a single computational thread?
+#' @param jvm should JVM be be loaded?  If \code{FALSE}, then
+#' \code{-nojvm}
+#' @param figure_windows should figure windows be enabled.  If
+#' not, \code{-noFigureWindows} will be called
 #' @export
 #' @return Character of command for matlab
 #' @examples 
@@ -23,6 +27,8 @@ get_matlab = function(
   desktop = FALSE,
   splash = FALSE,
   display = FALSE,
+  jvm = TRUE,
+  figure_windows = TRUE,
   wait = TRUE,
   single_thread = FALSE){
   # find.matlab <- system("which matlab", ignore.stdout=TRUE)
@@ -41,6 +47,8 @@ get_matlab = function(
   desktop = myfunc(desktop, "desktop")
   splash = myfunc(splash, "splash")
   display = myfunc(display, "display")
+  jvm = ifelse(!jvm, "-nojvm", "")
+  figure_windows = ifelse(!figure_windows, "-noFigureWindows", "")
   wait = ifelse(
       .Platform$OS.type %in% "windows", 
       ifelse(wait, "-wait", ""), 
@@ -50,6 +58,8 @@ get_matlab = function(
                    wait, " ",
                    desktop, " ", 
                    splash, " ", 
+                   jvm, " ",
+                   figure_windows, " ",
                    ifelse(single_thread, "-singleCompThread ", ""),
                    display, " -r ")
 
@@ -122,6 +132,8 @@ run_matlab_script = function(
   desktop = FALSE,
   splash = FALSE,
   display = FALSE,
+  jvm = TRUE,
+  figure_windows = TRUE,  
   wait = TRUE,
   single_thread = FALSE,
   ...){
@@ -131,6 +143,8 @@ run_matlab_script = function(
     splash = splash,
     display = display,
     wait = wait,
+    jvm = jvm,
+    figure_windows = figure_windows,
     single_thread = single_thread)
   cmd = paste0(' "', "try, run('", fname, "'); ",
                "catch err, disp(err.message); ", 
@@ -166,7 +180,12 @@ run_matlab_script = function(
 #'    paths_to_add = "~/")
 #' }
 #' \dontrun{ 
-#' if (have_matlab()){ 
+#' if (have_matlab()){
+#' system.time({ 
+#' run_matlab_code(c("disp('The version of the matlab is:')", 
+#' "disp(version)"), jvm = FALSE, 
+#' figure_windows = FALSE) 
+#' })
 #'    run_matlab_code("disp(version)")
 #'    run_matlab_code("disp(version)", paths_to_add = "~/")
 #'    run_matlab_code(c("x = 5", "disp(['The value of x is ', num2str(x)])"))

README.Rmd

@@ -1,5 +1,5 @@
 ---
-  output: github_document
+output: github_document
 ---
 
 [![Travis build status](https://travis-ci.org/muschellij2/matlabr.svg?branch=master)](https://travis-ci.org/muschellij2/matlabr)

README.md

@@ -1,16 +1,25 @@
 
-[![Travis build status](https://travis-ci.org/muschellij2/matlabr.svg?branch=master)](https://travis-ci.org/muschellij2/matlabr) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/muschellij2/matlabr?branch=master&svg=true)](https://ci.appveyor.com/project/muschellij2/matlabr) [![Coverage status](https://coveralls.io/repos/github/muschellij2/matlabr/badge.svg?branch=master)](https://coveralls.io/r/muschellij2/matlabr?branch=master) [![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/matlabr)](https://cran.R-project.org/package=matlabr) [![Downloads](https://cranlogs.r-pkg.org/badges/matlabr)](https://cran.R-project.org/package=matlabr)
+[![Travis build
+status](https://travis-ci.org/muschellij2/matlabr.svg?branch=master)](https://travis-ci.org/muschellij2/matlabr)
+[![AppVeyor Build
+Status](https://ci.appveyor.com/api/projects/status/github/muschellij2/matlabr?branch=master&svg=true)](https://ci.appveyor.com/project/muschellij2/matlabr)
+[![Coverage
+status](https://coveralls.io/repos/github/muschellij2/matlabr/badge.svg?branch=master)](https://coveralls.io/r/muschellij2/matlabr?branch=master)
+[![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/matlabr)](https://cran.R-project.org/package=matlabr)
+[![Downloads](https://cranlogs.r-pkg.org/badges/matlabr)](https://cran.R-project.org/package=matlabr)
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-matlabr Package:
-================
 
-`matlabr` is an R package to call MATLAB directly using `system` command. This is a simple package that tries to get around using `R.matlab` and a MATLAB server.
+# matlabr Package:
 
-Installation
-------------
+`matlabr` is an R package to call MATLAB directly using `system`
+command. This is a simple package that tries to get around using
+`R.matlab` and a MATLAB server.
 
-You can install the stable version on [CRAN](https://cran.R-project.org/package=matlabr):
+## Installation
+
+You can install the stable version on
+[CRAN](https://cran.R-project.org/package=matlabr):
 
 ``` r
 install.packages('matlabr', dependencies = TRUE)

cran-comments.md

@@ -1,7 +1,7 @@
 ## Test environments
-* local OS X install, R 3.5.1
-* ubuntu 14.04 (on travis-ci), R 3.5.1
-* win-builder (devel and release)
+* local R installation, R 4.0.0
+* ubuntu 16.04 (on travis-ci), R 4.0.0
+* win-builder (devel)
 
 ## R CMD check results
 

matlabr.Rproj

@@ -16,4 +16,4 @@ BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageCheckArgs: --as-cran
-PackageRoxygenize: rd,collate,namespace
+PackageRoxygenize: rd,collate,namespace,vignette