* [PATCH] Add support for tables in Calc src block :var
@ 2024-03-16 3:45 Visuwesh
2024-03-16 9:52 ` Ihor Radchenko
0 siblings, 1 reply; 10+ messages in thread
From: Visuwesh @ 2024-03-16 3:45 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
Attached patch adds support for passing tables as matrices (or vector)
to a Calc source block through the :var parameter. There might be a
better way to do it than manually construct the data structure expected
by Calc for a matrix but given that it rarely sees changes in this area,
it shouldn't be a bother.
I also added tests for this feature, and other simple tests to ensure
everything works. I checked that all the tests passed on my side.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ob-calc-Support-passing-tables-as-matrices-with-var.patch --]
[-- Type: text/x-diff, Size: 6126 bytes --]
From 5dd444a3dd688b366e1151739f6a8e8088bb0623 Mon Sep 17 00:00:00 2001
From: Visuwesh <visuweshm@gmail.com>
Date: Sat, 16 Mar 2024 09:10:53 +0530
Subject: [PATCH] ob-calc: Support passing tables as matrices with :var
A table with MxN dimensions is converted to a MxN matrix when given in
:var to a Calc source block. A table with a single row is converted
to a vector (i.e., row vector).
* lisp/ob-calc.el (org-babel-execute-src-block:calc): Construct the
right data structure to pass tables as matrices to Calc.
* testing/examples/ob-calc-test.org:
* testing/lisp/test-ob-calc.el: Add tests for ob-calc, and this new
feature.
---
lisp/ob-calc.el | 10 +++-
testing/examples/ob-calc-test.org | 57 ++++++++++++++++++++++
testing/lisp/test-ob-calc.el | 80 +++++++++++++++++++++++++++++++
3 files changed, 146 insertions(+), 1 deletion(-)
create mode 100644 testing/examples/ob-calc-test.org
create mode 100644 testing/lisp/test-ob-calc.el
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index f36df77ff..c8bbcd16b 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -64,7 +64,15 @@
(var-names (mapcar #'symbol-name org--var-syms)))
(mapc
(lambda (pair)
- (calc-push-list (list (cdr pair)))
+ (let ((val (cdr pair)))
+ (calc-push-list
+ (list (if (listp val)
+ (cons 'vec
+ (if (null (cdr val))
+ (car val)
+ (mapcar (lambda (x) (if (listp x) (cons 'vec x) x))
+ val)))
+ val))))
(calc-store-into (car pair)))
vars)
(mapc
diff --git a/testing/examples/ob-calc-test.org b/testing/examples/ob-calc-test.org
new file mode 100644
index 000000000..6df44c6a4
--- /dev/null
+++ b/testing/examples/ob-calc-test.org
@@ -0,0 +1,57 @@
+#+TITLE: Tests for ob-calc
+#+OPTIONS: ^:nil
+
+* Simple
+:PROPERTIES:
+:ID: 40e4cd26-fe15-45c0-938b-111e021a5a99
+:END:
+
+#+BEGIN_SRC calc :results silent
+ 1 * 2
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent
+ 12 + 16 - 1
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent
+ inv(a)
+#+END_SRC
+
+* Tables
+:PROPERTIES:
+:ID: 138938e1-f0ba-4c2b-babe-5d20f2b83557
+:END:
+
+#+NAME: ob-calc-table-1
+| 1 | 2 | 3 |
+| 5 | 6 | 7 |
+| 9 | 14 | 11 |
+
+#+NAME: ob-calc-table-2
+| 1 | 2 | 3 | 4 | 5 |
+
+#+NAME: ob-calc-table-3
+| 1 |
+| 2 |
+| 3 |
+
+#+BEGIN_SRC calc :results silent :var a=ob-calc-table-1
+ inv(a)
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ a*2 - 2
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ vmean(a)
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent :var a=ob-calc-table-3
+ a
+#+END_SRC
+
+#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ a
+#+END_SRC
diff --git a/testing/lisp/test-ob-calc.el b/testing/lisp/test-ob-calc.el
new file mode 100644
index 000000000..443ccd64b
--- /dev/null
+++ b/testing/lisp/test-ob-calc.el
@@ -0,0 +1,80 @@
+;;; test-ob-calc.el --- tests for ob-calc.el -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024 Visuwesh
+
+;; Author: Visuwesh <visuweshm@gmail.com>
+
+;; 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 of the License, 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'ob-calc)
+
+(unless (featurep 'ob-calc)
+ (signal 'missing-test-dependency "Support for Calc code blocks"))
+
+(ert-deftest ob-calc/simple-program-mult ()
+ "Test of simple multiplication."
+ (org-test-at-id "40e4cd26-fe15-45c0-938b-111e021a5a99"
+ (org-babel-next-src-block)
+ (should (equal "2" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/simple-program-arith ()
+ "Test of simple arithmetic."
+ (org-test-at-id "40e4cd26-fe15-45c0-938b-111e021a5a99"
+ (org-babel-next-src-block 2)
+ (should (equal "27" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/simple-program-symbolic ()
+ "Test of simple symbolic algebra."
+ (org-test-at-id "40e4cd26-fe15-45c0-938b-111e021a5a99"
+ (org-babel-next-src-block 3)
+ (should (equal "1 / a" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-inversion ()
+ "Test of a matrix inversion."
+ (org-test-at-id "138938e1-f0ba-4c2b-babe-5d20f2b83557"
+ (org-babel-next-src-block)
+ (should (equal "[[-1, 0.625, -0.125], [0.25, -0.5, 0.25], [0.5, 0.125, -0.125]]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-algebra ()
+ "Test of simple matrix algebra."
+ (org-test-at-id "138938e1-f0ba-4c2b-babe-5d20f2b83557"
+ (org-babel-next-src-block 2)
+ (should (equal "[0, 2, 4, 6, 8]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-mean ()
+ "Test of simple mean of a vector."
+ (org-test-at-id "138938e1-f0ba-4c2b-babe-5d20f2b83557"
+ (org-babel-next-src-block 3)
+ (should (equal "3"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-correct-conv-column ()
+ "Test of conversion of column table to Calc format."
+ (org-test-at-id "138938e1-f0ba-4c2b-babe-5d20f2b83557"
+ (org-babel-next-src-block 4)
+ (should (equal "[[1], [2], [3]]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-correct-conv-row ()
+ "Test of conversion of row table to Calc format."
+ (org-test-at-id "138938e1-f0ba-4c2b-babe-5d20f2b83557"
+ (org-babel-next-src-block 5)
+ (should (equal "[1, 2, 3, 4, 5]"
+ (org-babel-execute-src-block)))))
+
+(provide 'test-ob-calc)
+;;; test-ob-calc.el ends here
--
2.43.0
[-- Attachment #3: Type: text/plain, Size: 68 bytes --]
P.S. Please keep me in the CCs as I am not subscribed to the list.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-16 3:45 [PATCH] Add support for tables in Calc src block :var Visuwesh
@ 2024-03-16 9:52 ` Ihor Radchenko
2024-03-16 11:37 ` Visuwesh
0 siblings, 1 reply; 10+ messages in thread
From: Ihor Radchenko @ 2024-03-16 9:52 UTC (permalink / raw)
To: Visuwesh; +Cc: emacs-orgmode
Visuwesh <visuweshm@gmail.com> writes:
> Attached patch adds support for passing tables as matrices (or vector)
> to a Calc source block through the :var parameter. There might be a
> better way to do it than manually construct the data structure expected
> by Calc for a matrix but given that it rarely sees changes in this area,
> it shouldn't be a bother.
> I also added tests for this feature, and other simple tests to ensure
> everything works. I checked that all the tests passed on my side.
Thanks!
Since you are adding a new feature, may you also add an entry to etc/ORG-NEWS?
> - (calc-push-list (list (cdr pair)))
> + (let ((val (cdr pair)))
> + (calc-push-list
> + (list (if (listp val)
> + (cons 'vec
> + (if (null (cdr val))
> + (car val)
> + (mapcar (lambda (x) (if (listp x) (cons 'vec x) x))
> + val)))
> + val))))
It would be nice to add code comments explaining the Calc's internal
format. Ideally, with references to Calc's manual or source code.
Otherwise, this code looks like black magic :)
> +++ b/testing/examples/ob-calc-test.org
> @@ -0,0 +1,57 @@
> +#+TITLE: Tests for ob-calc
> +#+OPTIONS: ^:nil
Thanks a lot for adding many tests!
Would you mind using `org-test-with-temp-text' instead of
`org-test-at-id' as much as possible? Otherwise, looking at tests like
> +(ert-deftest ob-calc/simple-program-mult ()
> + "Test of simple multiplication."
> + (org-test-at-id "40e4cd26-fe15-45c0-938b-111e021a5a99"
> + (org-babel-next-src-block)
> + (should (equal "2" (org-babel-execute-src-block)))))
it is very difficult to understand what exactly the tests is checking.
`org-test-with-temp-text' would make things a lot more readable as we
would see the calc code being tested right inside the test code.
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-16 9:52 ` Ihor Radchenko
@ 2024-03-16 11:37 ` Visuwesh
2024-03-16 12:19 ` Ihor Radchenko
0 siblings, 1 reply; 10+ messages in thread
From: Visuwesh @ 2024-03-16 11:37 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 1883 bytes --]
[சனி மார்ச் 16, 2024] Ihor Radchenko wrote:
> Visuwesh <visuweshm@gmail.com> writes:
>
>> Attached patch adds support for passing tables as matrices (or vector)
>> to a Calc source block through the :var parameter. There might be a
>> better way to do it than manually construct the data structure expected
>> by Calc for a matrix but given that it rarely sees changes in this area,
>> it shouldn't be a bother.
>> I also added tests for this feature, and other simple tests to ensure
>> everything works. I checked that all the tests passed on my side.
>
> Thanks!
> Since you are adding a new feature, may you also add an entry to etc/ORG-NEWS?
Now done.
>> - (calc-push-list (list (cdr pair)))
>> + (let ((val (cdr pair)))
>> + (calc-push-list
>> + (list (if (listp val)
>> + (cons 'vec
>> + (if (null (cdr val))
>> + (car val)
>> + (mapcar (lambda (x) (if (listp x) (cons 'vec x) x))
>> + val)))
>> + val))))
>
> It would be nice to add code comments explaining the Calc's internal
> format. Ideally, with references to Calc's manual or source code.
> Otherwise, this code looks like black magic :)
I hope the comment I added in the attached patch is clear enough.
>> +++ b/testing/examples/ob-calc-test.org
>> @@ -0,0 +1,57 @@
>> +#+TITLE: Tests for ob-calc
>> +#+OPTIONS: ^:nil
>
> Thanks a lot for adding many tests!
> Would you mind using `org-test-with-temp-text' instead of
> `org-test-at-id' as much as possible? Otherwise, looking at tests like
OK, I wasn't sure what test style to use since the README in testing/
does not talk about writing new tests. Now I have adapted the tests to
use org-test-with-temp-text.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ob-calc.el-Add-support-for-tables-in-Calc-source-blo.patch --]
[-- Type: text/x-diff, Size: 6241 bytes --]
From 29962bc3ec33e1e25f83f153b681d49182368592 Mon Sep 17 00:00:00 2001
From: Visuwesh <visuweshm@gmail.com>
Date: Sat, 16 Mar 2024 17:04:14 +0530
Subject: [PATCH] ob-calc.el: Add support for tables in Calc source block :var
A table with MxN dimensions is converted to a MxN matrix when given in
:var to a Calc source block. A table with a single row is converted
to a vector (i.e., row vector).
* lisp/ob-calc.el (org-babel-execute-src-block:calc): Construct the
right data structure to pass tables as matrices to Calc.
* testing/lisp/test-ob-calc.el: Add tests for ob-calc, and this new
feature.
* etc/ORG-NEWS: Announce the feature.
---
etc/ORG-NEWS | 7 +++
lisp/ob-calc.el | 14 ++++-
testing/lisp/test-ob-calc.el | 115 +++++++++++++++++++++++++++++++++++
3 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 testing/lisp/test-ob-calc.el
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index ca73f06e7..197d7503d 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1121,6 +1121,13 @@ Maxima's graphics packages (~draw~ or ~plot~); the default remains
~plot~. The graphics terminal is now determined from the file-ending
of the file-name set in the ~:file~ header argument.
+*** =ob-calc.el=: Support for tables in ~:var~
+
+=ob-calc= now supports tables in ~:var~. They are converted to a
+matrix or a vector depending on the dimensionality of the table. A
+table with a single row is converted to a vector, the rest are
+converted to a matrix.
+
*** Images and files in clipboard can be pasted
Org asks the user what must be done when pasting images and files
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index f36df77ff..810ed1735 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -64,7 +64,19 @@
(var-names (mapcar #'symbol-name org--var-syms)))
(mapc
(lambda (pair)
- (calc-push-list (list (cdr pair)))
+ (let ((val (cdr pair)))
+ (calc-push-list
+ ;; For a vector, Calc follows the format (vec 1 2 3 ...) so
+ ;; a matrix becomes (vec (vec 1 2 3) (vec 4 5 6) ...). See
+ ;; the comments in "Arithmetic routines." section of
+ ;; calc.el.
+ (list (if (listp val)
+ (cons 'vec
+ (if (null (cdr val))
+ (car val)
+ (mapcar (lambda (x) (if (listp x) (cons 'vec x) x))
+ val)))
+ val))))
(calc-store-into (car pair)))
vars)
(mapc
diff --git a/testing/lisp/test-ob-calc.el b/testing/lisp/test-ob-calc.el
new file mode 100644
index 000000000..6d6ca104d
--- /dev/null
+++ b/testing/lisp/test-ob-calc.el
@@ -0,0 +1,115 @@
+;;; test-ob-calc.el --- tests for ob-calc.el -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024 Visuwesh
+
+;; Author: Visuwesh <visuweshm@gmail.com>
+
+;; 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 of the License, 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'ob-calc)
+
+(unless (featurep 'ob-calc)
+ (signal 'missing-test-dependency "Support for Calc code blocks"))
+
+(ert-deftest ob-calc/simple-program-mult ()
+ "Test of simple multiplication."
+ (org-test-with-temp-text "\
+#+BEGIN_SRC calc :results silent
+ 1 * 2
+#+END_SRC"
+ (should (equal "2" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/simple-program-arith ()
+ "Test of simple arithmetic."
+ (org-test-with-temp-text "\
+#+BEGIN_SRC calc :results silent
+ 12 + 16 - 1
+#+END_SRC"
+ (should (equal "27" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/simple-program-symbolic ()
+ "Test of simple symbolic algebra."
+ (org-test-with-temp-text "\
+#+BEGIN_SRC calc :results silent
+ inv(a)
+#+END_SRC"
+ (should (equal "1 / a" (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-inversion ()
+ "Test of a matrix inversion."
+ (org-test-with-temp-text "\
+#+NAME: ob-calc-table-1
+| 1 | 2 | 3 |
+| 5 | 6 | 7 |
+| 9 | 14 | 11 |
+
+<point>#+BEGIN_SRC calc :results silent :var a=ob-calc-table-1
+ inv(a)
+#+END_SRC "
+ (should (equal "[[-1, 0.625, -0.125], [0.25, -0.5, 0.25], [0.5, 0.125, -0.125]]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-algebra ()
+ "Test of simple matrix algebra."
+ (org-test-with-temp-text "\
+#+NAME: ob-calc-table-2
+| 1 | 2 | 3 | 4 | 5 |
+
+<point>#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ a*2 - 2
+#+END_SRC"
+ (should (equal "[0, 2, 4, 6, 8]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-mean ()
+ "Test of simple mean of a vector."
+ (org-test-with-temp-text "\
+#+NAME: ob-calc-table-2
+| 1 | 2 | 3 | 4 | 5 |
+
+<point>#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ vmean(a)
+#+END_SRC"
+ (should (equal "3"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-correct-conv-column ()
+ "Test of conversion of column table to Calc format."
+ (org-test-with-temp-text "\
+#+NAME: ob-calc-table-3
+| 1 |
+| 2 |
+| 3 |
+
+<point>#+BEGIN_SRC calc :results silent :var a=ob-calc-table-3
+ a
+#+END_SRC"
+ (should (equal "[[1], [2], [3]]"
+ (org-babel-execute-src-block)))))
+
+(ert-deftest ob-calc/matrix-correct-conv-row ()
+ "Test of conversion of row table to Calc format."
+ (org-test-with-temp-text "\
+#+NAME: ob-calc-table-2
+| 1 | 2 | 3 | 4 | 5 |
+
+<point>#+BEGIN_SRC calc :results silent :var a=ob-calc-table-2
+ a
+#+END_SRC"
+ (should (equal "[1, 2, 3, 4, 5]"
+ (org-babel-execute-src-block)))))
+
+(provide 'test-ob-calc)
+;;; test-ob-calc.el ends here
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-16 11:37 ` Visuwesh
@ 2024-03-16 12:19 ` Ihor Radchenko
2024-03-16 12:34 ` Visuwesh
0 siblings, 1 reply; 10+ messages in thread
From: Ihor Radchenko @ 2024-03-16 12:19 UTC (permalink / raw)
To: Visuwesh; +Cc: emacs-orgmode
Visuwesh <visuweshm@gmail.com> writes:
> Subject: [PATCH] ob-calc.el: Add support for tables in Calc source block :var
Thanks!
Applied, onto main.
I modified the patch to enable ob-calc tests by default.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=89b0773c3
>> Would you mind using `org-test-with-temp-text' instead of
>> `org-test-at-id' as much as possible? Otherwise, looking at tests like
>
> OK, I wasn't sure what test style to use since the README in testing/
> does not talk about writing new tests. Now I have adapted the tests to
> use org-test-with-temp-text.
Yeah. We do not have a dedicated style document for Org mode tests.
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-16 12:19 ` Ihor Radchenko
@ 2024-03-16 12:34 ` Visuwesh
2024-03-18 12:48 ` Fraga, Eric
0 siblings, 1 reply; 10+ messages in thread
From: Visuwesh @ 2024-03-16 12:34 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: emacs-orgmode
[சனி மார்ச் 16, 2024] Ihor Radchenko wrote:
> Visuwesh <visuweshm@gmail.com> writes:
>
>> Subject: [PATCH] ob-calc.el: Add support for tables in Calc source block :var
>
> Thanks!
> Applied, onto main.
> I modified the patch to enable ob-calc tests by default.
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=89b0773c3
Thanks!
>>> Would you mind using `org-test-with-temp-text' instead of
>>> `org-test-at-id' as much as possible? Otherwise, looking at tests like
>>
>> OK, I wasn't sure what test style to use since the README in testing/
>> does not talk about writing new tests. Now I have adapted the tests to
>> use org-test-with-temp-text.
>
> Yeah. We do not have a dedicated style document for Org mode tests.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-16 12:34 ` Visuwesh
@ 2024-03-18 12:48 ` Fraga, Eric
2024-03-18 15:29 ` Visuwesh
2024-03-30 13:04 ` Visuwesh
0 siblings, 2 replies; 10+ messages in thread
From: Fraga, Eric @ 2024-03-18 12:48 UTC (permalink / raw)
To: Visuwesh; +Cc: Ihor Radchenko, emacs-orgmode@gnu.org
Thank you for this. Potentially very useful.
As you have managed to understand calc internals (to a much greater
degrees than I have ever managed), do you know if there is any way to go
the other way? Specifically, I would love to make reference to calc
variables, especially those defined using embedded calc, in org tables.
Thanks again,
eric
--
Eric S Fraga, https://profiles.ucl.ac.uk/5958-eric-fraga
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-18 12:48 ` Fraga, Eric
@ 2024-03-18 15:29 ` Visuwesh
2024-03-18 15:45 ` Fraga, Eric
2024-03-30 13:04 ` Visuwesh
1 sibling, 1 reply; 10+ messages in thread
From: Visuwesh @ 2024-03-18 15:29 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: emacs-orgmode
[திங்கள் மார்ச் 18, 2024] Fraga, Eric wrote:
> Thank you for this. Potentially very useful.
>
> As you have managed to understand calc internals (to a much greater
> degrees than I have ever managed), do you know if there is any way to go
> the other way? Specifically, I would love to make reference to calc
> variables, especially those defined using embedded calc, in org tables.
You give me far too credit: I merely placed an edebug trigger for
calc-push-list and used a simple-minded ' [1,2,3;4,5,6] RET to figure
out the vector format (then later I found the commentary).
If I get the time, I will try to look into your request. Unfortunately,
I cannot promise anything since I am near the end of my semester making
me annoyingly busy.
[ I would like to make ob-calc turn matrices into tables in the result:
like what ob-fortran and others already do. ]
> Thanks again,
> eric
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-18 15:29 ` Visuwesh
@ 2024-03-18 15:45 ` Fraga, Eric
0 siblings, 0 replies; 10+ messages in thread
From: Fraga, Eric @ 2024-03-18 15:45 UTC (permalink / raw)
To: Visuwesh; +Cc: Ihor Radchenko, emacs-orgmode@gnu.org
On Monday, 18 Mar 2024 at 20:59, Visuwesh wrote:
> You give me far too credit: I merely placed an edebug trigger for
> calc-push-list and used a simple-minded ' [1,2,3;4,5,6] RET to figure
> out the vector format (then later I found the commentary).
Cute!
> If I get the time, I will try to look into your request. Unfortunately,
> I cannot promise anything since I am near the end of my semester making
> me annoyingly busy.
That's perfectly fine! I'm in no rush; it's just an itch that needs
scratching. :-)
Thank you,
eric
--
Eric S Fraga, https://profiles.ucl.ac.uk/5958-eric-fraga
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-18 12:48 ` Fraga, Eric
2024-03-18 15:29 ` Visuwesh
@ 2024-03-30 13:04 ` Visuwesh
2024-04-03 12:43 ` Fraga, Eric
1 sibling, 1 reply; 10+ messages in thread
From: Visuwesh @ 2024-03-30 13:04 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: emacs-orgmode
[திங்கள் மார்ச் 18, 2024] Fraga, Eric wrote:
Good day, Eric!
> Thank you for this. Potentially very useful.
>
> As you have managed to understand calc internals (to a much greater
> degrees than I have ever managed), do you know if there is any way to go
> the other way? Specifically, I would love to make reference to calc
> variables, especially those defined using embedded calc, in org tables.
Can you please provide a minimal example for me to play around with? I
realise I would like something like this too [*] but I don't know
concretely what this would/should look like.
[*] More specifically, I want to pass around src block evaluation
results in a table formula.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Add support for tables in Calc src block :var
2024-03-30 13:04 ` Visuwesh
@ 2024-04-03 12:43 ` Fraga, Eric
0 siblings, 0 replies; 10+ messages in thread
From: Fraga, Eric @ 2024-04-03 12:43 UTC (permalink / raw)
To: Visuwesh; +Cc: emacs-orgmode@gnu.org
On Saturday, 30 Mar 2024 at 18:34, Visuwesh wrote:
>> Specifically, I would love to make reference to calc variables,
>> especially those defined using embedded calc, in org tables.
>
> Can you please provide a minimal example for me to play around with? I
> realise I would like something like this too [*] but I don't know
> concretely what this would/should look like.
So, embedded calc processes expressions in any buffer, including org
mode, which might look like this:
x := 3
y := 5
z := 3 x - y => 4
where, in this case, the value of z has been determined by calc and the
answer given after the => in the line. The beauty of embedded calc is
you can change the value of x and the subsequent expressions will be
updated automatically (well, with C-x * u).
I would then love to be able to have a table that would allow me to
include the value of any variable, e.g. z above, something like
| var | value |
|-----+-------|
| x | 3 |
| z | 4 |
where the values in the second column are obtained by querying Calc.
--
: Eric S Fraga, with org release_9.6.23-1314-g945046 in Emacs 30.0.50
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-04-03 12:45 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-16 3:45 [PATCH] Add support for tables in Calc src block :var Visuwesh
2024-03-16 9:52 ` Ihor Radchenko
2024-03-16 11:37 ` Visuwesh
2024-03-16 12:19 ` Ihor Radchenko
2024-03-16 12:34 ` Visuwesh
2024-03-18 12:48 ` Fraga, Eric
2024-03-18 15:29 ` Visuwesh
2024-03-18 15:45 ` Fraga, Eric
2024-03-30 13:04 ` Visuwesh
2024-04-03 12:43 ` Fraga, Eric
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).