emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Eric Schulte" <schulte.eric@gmail.com>
To: Eric S Fraga <e.fraga@ucl.ac.uk>
Cc: Litvinov Sergey <slitvinov@gmail.com>, emacs-orgmode@gnu.org
Subject: Re: [babel] maxima support?
Date: Tue, 15 Mar 2011 09:32:41 -0600	[thread overview]
Message-ID: <87oc5c1js6.fsf@gmail.com> (raw)
In-Reply-To: <87fwqompb6.fsf@ucl.ac.uk> (Eric S. Fraga's message of "Tue, 15 Mar 2011 14:27:41 +0000")

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

Eric S Fraga <e.fraga@ucl.ac.uk> writes:

> "Eric Schulte" <schulte.eric@gmail.com> writes:
>
> [...]
>
>>
>> Ah, I see the problem, I used let instead of let*.  Please try this
>> updated version of the patch.  Sorry I would test this myself, but I
>> don't have Maxima installed.
>
> No problem at all!  I'm happy to test this as many times as necessary.
>
> In any case, this works fine in that maxima is indeed evaluated and
> output is returned.  However, two problems arise:
>
> 1. lines of the form "rat: replaced XXX by YYY = ZZZ" are not deleted
>    (as used to be by the grep -v replaced hack I had in the original
>    ob-maxima).  Essentially, we need to ignore output lines that match
>    the regex "^rat: replaced .*$" (I think this should do it...).
>
> 2. The output is converted to an org table:
>

The attached should fix both of these problems.  Please let me know how
this works.

Thanks -- Eric


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-adding-support-for-Maxima-code-blocks-thanks-to-Eric.patch --]
[-- Type: text/x-diff, Size: 3690 bytes --]

From 839612902cc1a0887f4e12cf408f3c8594b01599 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Mon, 14 Mar 2011 15:20:05 -0600
Subject: [PATCH] adding support for Maxima code blocks -- thanks to Eric Fraga

---
 lisp/ob-maxima.el |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 lisp/org.el       |    1 +
 2 files changed, 81 insertions(+), 0 deletions(-)
 create mode 100644 lisp/ob-maxima.el

diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
new file mode 100644
index 0000000..e8b2df4
--- /dev/null
+++ b/lisp/ob-maxima.el
@@ -0,0 +1,80 @@
+;;; org-babel-maxima.el --- org-babel functions for maxima evaluation
+
+;; Copyright (c) 2009, 2010, 2011 Eric S Fraga, Eric Schulte
+
+;; Author: Eric S Fraga, Eric Schulte
+;; Keywords: literate programming, reproducible research, maxima
+;; Homepage: http://orgmode.org
+;; Version: 0.01
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Org-Babel support for evaluating maxima entries.
+;;
+;; This differs from most standard languages in that
+;;
+;; 1) there is no such thing as a "session" in maxima
+;;
+;; 2) we are generally only going to return output from maxima
+;;
+;; 3) we are adding the "cmdline" header argument
+;;
+;; 4) there are no variables
+
+;;; Code:
+(require 'ob)
+
+(defvar org-babel-default-header-args:maxima '())
+
+(defun org-babel-maxima-expand (body params)
+  "Expand a block of Maxima code according to its header arguments."
+  body)
+
+(defun org-babel-execute:maxima (body params)
+  "Execute a block of Maxima entries with org-babel.  This function is
+called by `org-babel-execute-src-block'."
+  (message "executing Maxima source code block")
+  (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
+	 (cmdline (cdr (assoc :cmdline params)))
+	 (in-file (org-babel-temp-file "maxima-"))
+	 (cmd (format "maxima --very-quiet -r 'batchload(%S)$' %s"
+		      in-file cmdline)))
+    (with-temp-file in-file (insert body))
+    (message cmd)
+    ((lambda (raw) ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' "
+       (mapconcat
+	identity
+	(delq nil
+	      (mapcar (lambda (line)
+			(unless (or (string-match "batch" line)
+				    (string-match "^rat: replaced .*$" line)
+				    (= 0 (length line)))
+			  line))
+		      (split-string raw))) "\n"))
+     (org-babel-eval cmd ""))))
+
+(defun org-babel-prep-session:maxima (session params)
+  (error "Maxima does not support sessions"))
+
+(provide 'ob-maxima)
+
+;; arch-tag: d86c97ac-7eab-4349-8d8b-302dd09779a8
+
+;;; org-babel-maxima.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index 96ad8ff..ae0ef5e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -164,6 +164,7 @@ requirements) is loaded."
 		 (const :tag "Javascript" js)
 		 (const :tag "Latex" latex)
 		 (const :tag "Ledger" ledger)
+		 (const :tag "Maxima" maxima)
 		 (const :tag "Matlab" matlab)
 		 (const :tag "Mscgen" mscgen)
 		 (const :tag "Ocaml" ocaml)
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 433 bytes --]


>
> *** simple test
>     #+begin_src maxima :results value
> programmode: false;
> eq: x**2-1 = 0;
> solution: solve(eq, x);
> print(solution);
>     #+end_src
>
>     #+results:
>     | solve: | solution: | x | = | - | 1 | x | = | 1 | [%t1, | %t2] |
>
> This isn't necessary appropriate in this case...  but I guess this is
> now a matter of adding all the normal frills given that the basic
> functionality is there?
>
> Thanks!

  reply	other threads:[~2011-03-15 15:32 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-23  9:32 [babel] maxima support? Litvinov Sergey
2011-02-24 10:25 ` Eric S Fraga
2011-02-24 10:28   ` Eric S Fraga
2011-02-25  9:17   ` Litvinov Sergey
2011-02-25 23:58   ` Eric Schulte
2011-02-28 16:15     ` Eric S Fraga
2011-03-14 21:26       ` Eric Schulte
2011-03-15 10:47         ` Eric S Fraga
2011-03-15 13:17           ` Eric Schulte
2011-03-15 14:27             ` Eric S Fraga
2011-03-15 15:32               ` Eric Schulte [this message]
2011-03-15 16:39                 ` Eric S Fraga
2011-03-15 17:27                   ` Eric Schulte
2011-03-15 18:32                     ` Eric S Fraga

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oc5c1js6.fsf@gmail.com \
    --to=schulte.eric@gmail.com \
    --cc=e.fraga@ucl.ac.uk \
    --cc=emacs-orgmode@gnu.org \
    --cc=slitvinov@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).