mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

babel: R: Unify R write-to-file expressions 

* ob-R.el (org-babel-R-write-object-command): New unified R
    command for writing results to file
    (org-babel-R-wrapper-method): Remove variable
    (org-babel-R-wrapper-lastvar): Remove variable
    (org-babel-R-evaluate-external-process): Use new R command
    (org-babel-R-evaluate-session): Use new R command
This commit is contained in:
Dan Davison 2010-08-28 08:52:37 -04:00
parent 08cdd05579
commit fcfba8d487
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/ob-R.el
View File

@ -217,9 +217,7 @@ current code buffer."
(defvar org-babel-R-eoe-indicator "'org_babel_R_eoe'") (defvar org-babel-R-eoe-indicator "'org_babel_R_eoe'")
(defvar org-babel-R-eoe-output "[1] \"org_babel_R_eoe\"") (defvar org-babel-R-eoe-output "[1] \"org_babel_R_eoe\"")
(defvar org-babel-R-wrapper-method "main <- function ()\n{\n%s\n} (defvar org-babel-R-write-object-command "{function(object, transfer.file) {invisible(if(inherits(try(write.table(object, file=transfer.file, sep=\"\\t\", na=\"nil\",row.names=%s, col.names=%s, quote=FALSE), silent=TRUE),\"try-error\")) {if(!file.exists(transfer.file)) file.create(transfer.file)})}}(object=%s, transfer.file=\"%s\")")
write.table(main(), file=\"%s\", sep=\"\\t\", na=\"nil\",row.names=%s, col.names=%s, quote=FALSE)")
(defvar org-babel-R-wrapper-lastvar "write.table(.Last.value, file=\"%s\", sep=\"\\t\", na=\"nil\",row.names=%s, col.names=%s, quote=FALSE)")
(defun org-babel-R-evaluate (defun org-babel-R-evaluate
(session body result-type column-names-p row-names-p) (session body result-type column-names-p row-names-p)
@ -240,12 +238,13 @@ last statement in BODY, as elisp."
(value (value
(let ((tmp-file (org-babel-temp-file "R-results-"))) (let ((tmp-file (org-babel-temp-file "R-results-")))
(org-babel-eval org-babel-R-command (org-babel-eval org-babel-R-command
(format org-babel-R-wrapper-method (format org-babel-R-write-object-command
body tmp-file
(if row-names-p "TRUE" "FALSE") (if row-names-p "TRUE" "FALSE")
(if column-names-p (if column-names-p
(if row-names-p "NA" "TRUE") (if row-names-p "NA" "TRUE")
"FALSE"))) "FALSE")
(format "{function ()\n{\n%s\n}}()" body)
tmp-file))
(org-babel-R-process-value-result (org-babel-R-process-value-result
(org-babel-import-elisp-from-file (org-babel-import-elisp-from-file
(org-babel-maybe-remote-file tmp-file) '(16)) column-names-p))) (org-babel-maybe-remote-file tmp-file) '(16)) column-names-p)))
@ -267,12 +266,12 @@ last statement in BODY, as elisp."
(let ((tmp-file (org-babel-temp-file "R-"))) (let ((tmp-file (org-babel-temp-file "R-")))
(org-babel-comint-eval-invisibly-and-wait-for-file (org-babel-comint-eval-invisibly-and-wait-for-file
session (org-babel-maybe-remote-file tmp-file) session (org-babel-maybe-remote-file tmp-file)
(format org-babel-R-wrapper-lastvar (format org-babel-R-write-object-command
tmp-file (if row-names-p "TRUE" "FALSE")
(if row-names-p "TRUE" "FALSE") (if column-names-p
(if column-names-p (if row-names-p "NA" "TRUE")
(if row-names-p "NA" "TRUE") "FALSE")
"FALSE")) ".Last.value" tmp-file))
(org-babel-R-process-value-result (org-babel-R-process-value-result
(org-babel-import-elisp-from-file (org-babel-import-elisp-from-file
(org-babel-maybe-remote-file tmp-file) '(16)) column-names-p))) (org-babel-maybe-remote-file tmp-file) '(16)) column-names-p)))