From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juan Pechiar Subject: Re: Re: [BABEL] Output with octave [PATCH] Date: Sun, 1 Aug 2010 17:22:14 -0300 Message-ID: <20100801202214.GU5569@soloJazz.com> References: <87iq45x06e.wl%ucecesf@ucl.ac.uk> <871vai42nz.fsf@stats.ox.ac.uk> <20100801200727.GT5569@soloJazz.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=59990 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OffBZ-000498-Pj for emacs-orgmode@gnu.org; Sun, 01 Aug 2010 16:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Off35-0006kP-A8 for emacs-orgmode@gnu.org; Sun, 01 Aug 2010 16:22:20 -0400 Received: from cpoproxy1-pub.bluehost.com ([69.89.21.11]:45521) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1Off35-0006kA-0p for emacs-orgmode@gnu.org; Sun, 01 Aug 2010 16:22:19 -0400 Content-Disposition: inline In-Reply-To: <20100801200727.GT5569@soloJazz.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Dan Davison Cc: emacs-orgmode@gnu.org, "d.tchin" 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.