Hi,
Below is a single PATCH for the 3 issues:
- passing tables with EXP or complex notation to octave
- correct formatting of matrixes into octave
- interpretation of octave output as table
Regards,
.j.
8<------------------------------------------------------------
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index 8e99f86..bf7fdd3 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -119,8 +119,9 @@ end")
Converts an emacs-lisp variable into a string of octave code
specifying a variable of the same value."
(if (listp var)
- (concat "[" (mapconcat #'org-babel-octave-var-to-octave var ",
") "]")
- (format "%S" var)))
+ (concat "[" (mapconcat #'org-babel-octave-var-to-octave var
+ (if (listp (car var)) "; " ",")) "]")
+ (format "%s" var)))
(defun org-babel-prep-session:octave (session params &optional
matlabp)
"Prepare SESSION according to the header arguments specified in
PARAMS."
@@ -181,7 +182,7 @@ value of the last statement in BODY, as elisp."
(org-babel-eval
cmd
(format org-babel-octave-wrapper-method body tmp-file
tmp-file))
- (org-babel-eval-read-file tmp-file))))))
+ (org-babel-octave-import-elisp-from-file tmp-file))))))
(defun org-babel-octave-evaluate-session
(session body result-type &optional matlabp)
8<------------------------------------------------------------
On Sun, Aug 01, 2010 at 05:07:27PM -0300, Juan wrote:
> I'm starting to work with ob-octave and found several problems:
>
> The first, for which I have a fix (see patch below) is that octave's
> output was passed on as a string instead of being interpreted as a table:
> The second problem is that if I use octave table output as input to
> another block, it gets interpreted as a string instead of a vector:
> This has to do with the EXP notation. The 'e+00' suffix makes the
> whole table into a string. The problem is with "%S" in the formatting
> inside org-babel-octave-var-to-octave.
> A third problem is with org-babel-octave-var-to-octave.
>
> For example:
>
> : (org-babel-octave-var-to-octave '( ( 1 2 3 ) ( 4 5 6 ) ))
> : -> "[[1, 2, 3], [4, 5, 6]]"
>
> This is not a 2x3 matrix, but a 1x6 vector:
>
> : octave-3.2.3:1> [[1,2,3],[4,5,6]]
> : ans =
> : 1 2 3 4 5 6
>
> a semicolon ';' or '\n' is needed between rows instead of a comma.
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
