From 2844c1ffbdbaea2a5cc4dcc7e05d43e919969193 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 31 Aug 2020 14:44:53 +0100 Subject: Lint tree.el - add Version, URL, Package-Requires sections - prefer `tree-` prefer to `tree/` --- emacs/.emacs.d/wpc/tree.el | 84 ++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 40 deletions(-) (limited to 'emacs/.emacs.d/wpc') diff --git a/emacs/.emacs.d/wpc/tree.el b/emacs/.emacs.d/wpc/tree.el index 43df4dc500e7..8ef88e4efdd1 100644 --- a/emacs/.emacs.d/wpc/tree.el +++ b/emacs/.emacs.d/wpc/tree.el @@ -1,5 +1,9 @@ ;;; tree.el --- Working with Trees -*- lexical-binding: t -*- + ;; Author: William Carroll +;; Version: 0.0.1 +;; URL: https://git.wpcarro.dev/wpcarro/briefcase +;; Package-Requires: ((emacs "25.1")) ;;; Commentary: ;; Some friendly functions that hopefully will make working with trees cheaper @@ -42,12 +46,12 @@ (cl-defstruct node value children) -(cl-defun tree/node (value &optional children) +(cl-defun tree-node (value &optional children) "Create a node struct of VALUE with CHILDREN." (make-node :value value :children children)) -(defun tree/reduce-breadth (acc f xs) +(defun tree-reduce-breadth (acc f xs) "Reduce over XS breadth-first applying F to each x and ACC (in that order). Breadth-first traversals guarantee to find the shortest path in a graph. They're typically more difficult to implement than DFTs and may also incur @@ -55,7 +59,7 @@ Breadth-first traversals guarantee to find the shortest path in a graph. ;; TODO: Support :order as 'pre | 'in | 'post. ;; TODO: Troubleshoot why I need defensive (nil? node) check. -(defun tree/reduce-depth (acc f node) +(defun tree-reduce-depth (acc f node) "Reduce over NODE depth-first applying F to each NODE and ACC. F is called with each NODE, ACC, and the current depth. Depth-first traversals have the advantage of typically consuming less memory @@ -66,12 +70,12 @@ Depth-first traversals have the advantage of typically consuming less memory (acc f node depth) (let ((acc-new (funcall f node acc depth))) (if (or (maybe/nil? node) - (tree/leaf? node)) + (tree-leaf? node)) acc-new (list/reduce acc-new (lambda (node acc) - (tree/do-reduce-depth + (tree-do-reduce-depth acc f node @@ -83,19 +87,19 @@ Depth-first traversals have the advantage of typically consuming less memory ;; Helpers ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun tree/height (xs) +(defun tree-height (xs) "Return the height of tree XS.") ;; TODO: Troubleshoot why need for (nil? node). Similar misgiving ;; above. -(defun tree/leaf-depths (xs) +(defun tree-leaf-depths (xs) "Return a list of all of the depths of the leaf nodes in XS." (list/reverse - (tree/reduce-depth + (tree-reduce-depth '() (lambda (node acc depth) (if (or (maybe/nil? node) - (tree/leaf? node)) + (tree-leaf? node)) (list/cons depth acc) acc)) xs))) @@ -109,7 +113,7 @@ Depth-first traversals have the advantage of typically consuming less memory ;; TODO: Bail out before stack overflowing by consider branching, current-depth. -(cl-defun tree/random (&optional (value-fn (lambda (_) nil)) +(cl-defun tree-random (&optional (value-fn (lambda (_) nil)) (branching-factor 2)) "Randomly generate a tree with BRANCHING-FACTOR using VALUE-FN to compute the node values. VALUE-FN is called with the current-depth of the node. Useful for @@ -129,20 +133,20 @@ generating test data. Warning this function can overflow the stack." ;; Predicates ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun tree/instance? (tree) +(defun tree-instance? (tree) "Return t if TREE is a tree struct." (node-p tree)) -(defun tree/leaf? (node) +(defun tree-leaf? (node) "Return t if NODE has no children." (maybe/nil? (node-children node))) -(defun tree/balanced? (n xs) +(defun tree-balanced? (n xs) "Return t if the tree, XS, is balanced. A tree is balanced if none of the differences between any two depths of two leaf nodes in XS is greater than N." (> n (->> xs - tree/leaf-depths + tree-leaf-depths set/from-list set/count number/dec))) @@ -151,7 +155,7 @@ A tree is balanced if none of the differences between any two depths of two leaf ;; Tests ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defconst tree/enable-testing? t +(defconst tree-enable-testing? t "When t, test suite runs.") ;; TODO: Create set of macros for a proper test suite including: @@ -160,33 +164,33 @@ A tree is balanced if none of the differences between any two depths of two leaf ;; - line numbers for errors ;; - accumulated output for synopsis ;; - do we want describe *and* it? Why not a generic label that works for both? -(when tree/enable-testing? - (let ((tree-a (tree/node 1 - (list (tree/node 2 - (list (tree/node 5) - (tree/node 6))) - (tree/node 3 - (list (tree/node 7) - (tree/node 8))) - (tree/node 4 - (list (tree/node 9) - (tree/node 10)))))) - (tree-b (tree/node 1 - (list (tree/node 2 - (list (tree/node 5) - (tree/node 6))) - (tree/node 3) - (tree/node 4 - (list (tree/node 9) - (tree/node 10))))))) +(when tree-enable-testing? + (let ((tree-a (tree-node 1 + (list (tree-node 2 + (list (tree-node 5) + (tree-node 6))) + (tree-node 3 + (list (tree-node 7) + (tree-node 8))) + (tree-node 4 + (list (tree-node 9) + (tree-node 10)))))) + (tree-b (tree-node 1 + (list (tree-node 2 + (list (tree-node 5) + (tree-node 6))) + (tree-node 3) + (tree-node 4 + (list (tree-node 9) + (tree-node 10))))))) ;; instance? - (prelude/assert (tree/instance? tree-a)) - (prelude/assert (tree/instance? tree-b)) - (prelude/refute (tree/instance? '(1 2 3))) - (prelude/refute (tree/instance? "oak")) + (prelude/assert (tree-instance? tree-a)) + (prelude/assert (tree-instance? tree-b)) + (prelude/refute (tree-instance? '(1 2 3))) + (prelude/refute (tree-instance? "oak")) ;; balanced? - (prelude/assert (tree/balanced? 1 tree-a)) - (prelude/refute (tree/balanced? 1 tree-b)) + (prelude/assert (tree-balanced? 1 tree-a)) + (prelude/refute (tree-balanced? 1 tree-b)) (message "Tests pass!"))) (provide 'tree) -- cgit 1.4.1