what's new …
edited the documentation string to `org-plot/zip-deps-with',
removed some redundancies there,
removed my ›zip‹ function, in favour of ›cl-mapcar 'cons‹,
simplified the double test `stringp', `string=' with `equal'.
simplified the unit tests correspondingly.
make test: no unexpected failing tests.
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index a23195d2a..c44cca991 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -156,7 +156,8 @@ and dependent variables."
table)))
;; write table to gnuplot grid datafile format
(with-temp-file data-file
- (let ((num-rows (length table)) (num-cols (length (nth 0 table)))
+ (let ((num-rows (length table))
+ (num-cols (length (nth 0 table)))
(gnuplot-row (lambda (col row value)
(setf col (+ 1 col)) (setf row (+ 1 row))
(format "%f %f %f\n%f %f %f\n"
@@ -179,6 +180,22 @@ and dependent variables."
(setf back-edge "") (setf front-edge ""))))
row-vals))
+(defun org-plot/zip-deps-with (num-cols ind deps with)
+ "Describe each column to be plotted as (col . with).
+Loops over DEPS and WITH in order to cons their elements.
+If the DEPS list of columns is not given, use all columns from 1
+to NUM-COLS, excluding IND.
+If WITH is given as a string, use the given value for all
+columns.
+If WITH is given as a list, and it's shorter than DEPS, expand it
+with the global default value."
+ (unless deps
+ (setq deps (remove ind (number-sequence 1 num-cols))))
+ (unless (listp with)
+ (setq with (make-list (length deps) with)))
+ (setq with (append with (make-list (- (length deps) (length with)) "lines")))
+ (cl-mapcar 'cons deps with))
+
(defun org-plot/gnuplot-script (data-file num-cols params &optional preface)
"Write a gnuplot script to DATA-FILE respecting the options set in PARAMS.
NUM-COLS controls the number of columns plotted in a 2-d plot.
@@ -240,22 +257,24 @@ manner suitable for prepending to a user-specified script."
"%Y-%m-%d-%H:%M:%S") "\"")))
(unless preface
(pcase type ; plot command
- (`2d (dotimes (col num-cols)
- (unless (and (eq type '2d)
- (or (and ind (equal (1+ col) ind))
- (and deps (not (member (1+ col) deps)))))
- (setf plot-lines
- (cons
- (format plot-str data-file
- (or (and ind (> ind 0)
- (not text-ind)
- (format "%d:" ind)) "")
- (1+ col)
- (if text-ind (format ":xticlabel(%d)" ind) "")
- with
- (or (nth col col-labels)
- (format "%d" (1+ col))))
- plot-lines)))))
+ (`2d (dolist
+ (col-with
+ (org-plot/zip-deps-with num-cols ind deps with))
+ (setf plot-lines
+ (cons
+ (format plot-str data-file
+ (or (and ind (> ind 0)
+ (not text-ind)
+ (format "%d:" ind)) "")
+ (car col-with)
+ (if text-ind (format ":xticlabel(%d)" ind) "")
+ (cdr col-with)
+ (apply (lambda (x)
+ (if (= 0 (length x))
+ (format "%d" (car col-with))
+ x))
+ (list (nth (1- (car col-with)) col-labels))))
+ plot-lines))))
(`3d
(setq plot-lines (list (format "'%s' matrix with %s title ''"
data-file with))))
@@ -310,7 +329,8 @@ line directly before or after the table."
table data-file params)))
(when y-labels (plist-put params :ylabels y-labels)))))
;; Check for timestamp ind column.
- (let ((ind (1- (plist-get params :ind))))
+ (let ((ind (1- (plist-get params :ind)))
+ (with (plist-get params :with)))
(when (and (>= ind 0) (eq '2d (plist-get params :plot-type)))
(if (= (length
(delq 0 (mapcar
@@ -320,7 +340,7 @@ line directly before or after the table."
0)
(plist-put params :timeind t)
;; Check for text ind column.
- (if (or (string= (plist-get params :with) "hist")
+ (if (or (equal with "hist")
(> (length
(delq 0 (mapcar
(lambda (el)
diff --git a/testing/lisp/test-org-plot.el b/testing/lisp/test-org-plot.el
new file mode 100644
index 000000000..2bbd09b5f
--- /dev/null
+++ b/testing/lisp/test-org-plot.el
@@ -0,0 +1,50 @@
+;;; test-org-plot.el --- Tests for org-plot.el
+
+;; Copyright (C) 2020 Mario Frasca
+
+;; Author: Mario Frasca <mario at anche dot no>
+
+;; Released under the GNU General Public License version 3
+;; see: http://www.gnu.org/licenses/gpl-3.0.html
+
+;;;; Comments
+
+
+
+;;; Code:
+
+(require 'org-test)
+(require 'org-plot)
+
+
+;; General auxiliaries
+
+(ert-deftest test-org-plot/zip-deps-with ()
+ "Test `org-plot/zip-deps-with' specifications."
+ ;; no deps, no with. defaults to all except ind, and "lines"
+ (should
+ (equal (org-plot/zip-deps-with 3 1 nil nil)
+ '((2 . "lines") (3 . "lines"))))
+ ;; no deps, single with. defaults to all except ind, and repeated with
+ (should
+ (equal (org-plot/zip-deps-with 3 1 nil "hist")
+ '((2 . "hist") (3 . "hist"))))
+ ;; no deps, explicit with
+ (should
+ (equal (org-plot/zip-deps-with 3 1 nil '("points" "hist"))
+ '((2 . "points") (3 . "hist"))))
+ ;; explicit with, same length as deps
+ (should
+ (equal (org-plot/zip-deps-with 5 1 '(2 4) '("points" "hist"))
+ '((2 . "points") (4 . "hist"))))
+ ;; same as above, but different order
+ (should
+ (equal (org-plot/zip-deps-with 5 1 '(4 2) '("points" "hist"))
+ '((4 . "points") (2 . "hist"))))
+ ;; fills in with "lines"
+ (should
+ (equal (org-plot/zip-deps-with 5 1 '(4 2 3) '("points"))
+ '((4 . "points") (2 . "lines") (3 . "lines")))))
+
+(provide 'test-org-plot)
+;;; test-org-plot.el end here
