From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarmo Hurri Subject: [PATCH] Lookup functions, take two Date: Sun, 23 Sep 2012 18:26:19 +0300 Message-ID: <87y5k0g3qc.fsf@syk.fi> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:36498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFo4p-0000iM-SB for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 11:26:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFo4o-0007ds-05 for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 11:26:35 -0400 Received: from plane.gmane.org ([80.91.229.3]:37777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFo4n-0007dn-Kv for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 11:26:33 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TFo4r-0003hM-2Y for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 17:26:37 +0200 Received: from cs181237063.pp.htv.fi ([82.181.237.63]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Sep 2012 17:26:37 +0200 Received: from jarmo.hurri by cs181237063.pp.htv.fi with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Sep 2012 17:26:37 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Greetings. Modified the patch as requested: the ordering in the documentation is now "Column formulas" before the new "Lookup functions". Also made org-table.el (require 'cl) in general, not only compile time, because there was a warning of it being required at runtime, but there is still a warning at compile time. Seemed like a reasonable thing to do, although given the discussion on possible namespace clashes on the net makes me doubt the approach. It seems GNU does not like CL. I can implement a new function corresponding to CL's "position" if you find it necessary. Have fun. -- Jarmo --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Lookup-functions-for-tables.patch Content-Description: lookup functions >From 238551583ecf381d576f42b718e16f1601a43e55 Mon Sep 17 00:00:00 2001 From: Jarmo Hurri Date: Sun, 23 Sep 2012 18:16:01 +0300 Subject: [PATCH] Lookup functions for tables * lisp/org-table.el: added functions org-lookup-first and org-lookup-last * doc/org.texi: documented the use of lookup functions --- doc/org.texi | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++- lisp/org-table.el | 13 ++++++- 2 files changed, 98 insertions(+), 4 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index e740ca5..2eb8b58 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -378,6 +378,7 @@ The spreadsheet * Durations and time values:: How to compute durations and time values * Field and range formulas:: Formula for specific (ranges of) fields * Column formulas:: Formulas valid for an entire column +* Lookup functions:: Lookup functions for searching tables * Editing and debugging formulas:: Fixing formulas * Updating the table:: Recomputing all dependent fields * Advanced features:: Field and column names, parameters and automatic recalc @@ -2405,6 +2406,7 @@ formula, moving these references by arrow keys * Durations and time values:: How to compute durations and time values * Field and range formulas:: Formula for specific (ranges of) fields * Column formulas:: Formulas valid for an entire column +* Lookup functions:: Lookup functions for searching tables * Editing and debugging formulas:: Fixing formulas * Updating the table:: Recomputing all dependent fields * Advanced features:: Field and column names, parameters and automatic recalc @@ -2790,7 +2792,7 @@ can also be used to assign a formula to some but not all fields in a row. Named field, see @ref{Advanced features}. @end table -@node Column formulas, Editing and debugging formulas, Field and range formulas, The spreadsheet +@node Column formulas, Lookup functions, Field and range formulas, The spreadsheet @subsection Column formulas @cindex column formula @cindex formula, for table column @@ -2829,7 +2831,90 @@ stores it. With a numeric prefix argument(e.g.@: @kbd{C-5 C-c =}) the command will apply it to that many consecutive fields in the current column. @end table -@node Editing and debugging formulas, Updating the table, Column formulas, The spreadsheet +@node Lookup functions, Editing and debugging formulas, Column formulas, The spreadsheet +@subsection Lookup functions +@cindex lookup functions in tables +@cindex table lookup functions + +Org has two predefined Emacs Lisp functions for lookups in tables. +@table @code +@item (org-lookup-first val search-list return-list &optional predicate) +@findex org-lookup-first +Searches for the first element @code{el} in list @code{search-list} for which +@lisp +(predicate val el) +@end lisp +is @code{t}; returns a value from the corresponding +position in list @code{return-list}. The default @code{predicate} is +@code{equal}. +@item (org-lookup-last val search-list return-list &optional predicate) +@findex org-lookup-last +Similar as @code{org-lookup-first} above, but searches for the @i{last} element for which the predicate is +@code{t}. +@end table + +The examples below illustrate searches inside a single table. In real-world +applications, the searched data is often in a different table and is accessed +by remote references. + +The first example contains the searched data in the first and the second +column. The lookup is performed in column 5, where the year corresponding to +the percentage in column 4 is searched. Notice that an error is returned if +the lookup is unsuccessful. +@example +@group + | year | percentage | | percentage | year | + |------+------------+---+------------+--------| + | 2009 | 12.2 | | 14.3 | 2010 | + | 2010 | 14.3 | | 19.4 | 2012 | + | 2011 | 14.3 | | 11.5 | #ERROR | + | 2012 | 19.4 | | | #ERROR | + #+TBLFM: $5='(org-lookup-first $4 '(@@2$2..@@>$2) '(@@2$1..@@>$1));N +@end group +@end example + +The second example illustrates standard use of lookups for teachers. The +first two columns contain a grading table. The fourth and the fifth column +contain student names and their marks, and the last column contains the +results of doing a lookup for the appropriate grade. Notice the use of +@code{org-lookup-last}, the predicate @code{>=} and the use of the @code{L} +flag for literal interpolation of table values. +@example +@group + | lower bound | grade | | student | marks | grade | + |-------------+-------+---+---------+-------+-------| + | 0 | D | | X | 33 | A | + | 10 | C | | Y | 5 | D | + | 20 | B | | Z | 10 | C | + | 30 | A | | W | 22 | B | + #+TBLFM: $6='(org-lookup-last $5 '(@@2$1..@@>$1) '(@@2$2..@@>$2) '>=);L +@end group +@end example + +In the previous examples the searched ranges were one-dimensional (single +columns). Because two-dimensional ranges are converted to one-dimensional +vectors in Lisp expressions, it is also possible to search true +two-dimensional ranges. The example below does a lookup in the two first +columns for values whose distance from @code{search key} is at most 1. +@example +@group +#+BEGIN_SRC emacs-lisp +(defun my-p (val1 val2) + (<= (abs (- val1 val2)) 1)) +#+END_SRC + +#+RESULTS: +: my-p + +| group 1 | group 2 | | search key | result | +|---------+---------+---+------------+--------| +| 22 | 12 | | -9 | -8 | +| -8 | 11 | | 23 | 22 | +#+TBLFM: $5='(org-lookup-first $4 '(@@2$1..@@>$2) '(@@2$1..@@>$2) 'my-p);N +@end group +@end example + +@node Editing and debugging formulas, Updating the table, Lookup functions, The spreadsheet @subsection Editing and debugging formulas @cindex formula editing @cindex editing, of table formulas diff --git a/lisp/org-table.el b/lisp/org-table.el index 37889af..3db603f 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -34,8 +34,7 @@ ;;; Code: -(eval-when-compile - (require 'cl)) +(require 'cl) (require 'org) (declare-function org-table-clean-before-export "org-exp" @@ -4826,6 +4825,16 @@ list of the fields in the rectangle ." (org-table-get-range (match-string 0 form) tbeg 1)) form))))))))) +(defmacro org-lookup-function (name-str from-end-p) + `(defun ,(intern (format "org-lookup-%s" name-str)) (val search-list return-list &optional predicate) + "Searches for the element el in list search-list for which +(predicate val el) is t; returns a value from the corresponding +position in list return-list. The default predicate is equal." + (let ((p (if (eq predicate nil) 'equal predicate))) + (nth (position val search-list :test p :from-end ,from-end-p) return-list)))) +(org-lookup-function "first" nil) +(org-lookup-function "last" t) + (provide 'org-table) ;;; org-table.el ends here -- 1.7.7.6 --=-=-=--