diff options
| author | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2023-09-13 09:54:12 -0600 |
|---|---|---|
| committer | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2023-09-13 09:54:12 -0600 |
| commit | 2e284b71500a1f8dc6cc46ecf21eb1e9389ea780 (patch) | |
| tree | e9227f4ad4e9987dcc64055803ab3e70a5e801ce /cl | |
| parent | 2cb14ebf79dd43aa96d54e65a0841d195d07bdf9 (diff) | |
| download | cmath-2e284b71500a1f8dc6cc46ecf21eb1e9389ea780.tar.gz cmath-2e284b71500a1f8dc6cc46ecf21eb1e9389ea780.zip | |
new table macro, notes for 9/11
Diffstat (limited to 'cl')
| -rw-r--r-- | cl/lizfcm.asd | 4 | ||||
| -rw-r--r-- | cl/src/approx/derivative.lisp | 3 | ||||
| -rw-r--r-- | cl/src/utils/package.lisp | 3 | ||||
| -rw-r--r-- | cl/src/utils/table.lisp | 11 | ||||
| -rw-r--r-- | cl/tests/approx.lisp | 3 | ||||
| -rw-r--r-- | cl/tests/table.lisp | 31 |
6 files changed, 51 insertions, 4 deletions
diff --git a/cl/lizfcm.asd b/cl/lizfcm.asd index 9e91eb0..ad69fa1 100644 --- a/cl/lizfcm.asd +++ b/cl/lizfcm.asd @@ -7,6 +7,7 @@ ((:module "utils" :components ((:file "within-range" :depends-on ("package")) + (:file "table" :depends-on ("package")) (:file "package"))) (:module "approx" :components @@ -21,7 +22,8 @@ :lizfcm) :components ((:module "tests" :components - ((:file "approx" :depends-on ("suite")) + ((:file "table" :depends-on ("suite")) + (:file "approx" :depends-on ("suite")) (:file "suite")))) :perform (asdf:test-op (o c) (uiop:symbol-call :fiveam :run! diff --git a/cl/src/approx/derivative.lisp b/cl/src/approx/derivative.lisp index 280463f..02fcb4c 100644 --- a/cl/src/approx/derivative.lisp +++ b/cl/src/approx/derivative.lisp @@ -5,4 +5,5 @@ (x1 (- x delta)) (y2 (apply f (list x2))) (y1 (apply f (list x1)))) - (/ (- y2 y1) (- x2 x1)))) + (/ (- y2 y1) + (- x2 x1)))) diff --git a/cl/src/utils/package.lisp b/cl/src/utils/package.lisp index 0436a94..bdd5589 100644 --- a/cl/src/utils/package.lisp +++ b/cl/src/utils/package.lisp @@ -1,4 +1,5 @@ (in-package :cl-user) (defpackage lizfcm.utils (:use :cl) - (:export :within-range-p)) + (:export :within-range-p + :table)) diff --git a/cl/src/utils/table.lisp b/cl/src/utils/table.lisp new file mode 100644 index 0000000..e96f37b --- /dev/null +++ b/cl/src/utils/table.lisp @@ -0,0 +1,11 @@ +(in-package :lizfcm.utils) + +(defmacro table ((&key headers domain-order domain-values) &body body) + `(cons + ,headers + (mapcar (lambda (tuple) + (destructuring-bind ,domain-order tuple + (append tuple + (list + ,@body)))) + ,domain-values))) diff --git a/cl/tests/approx.lisp b/cl/tests/approx.lisp index a458e66..2fd8124 100644 --- a/cl/tests/approx.lisp +++ b/cl/tests/approx.lisp @@ -15,9 +15,10 @@ :description "derivative at is within bounds" (let ((f (lambda (x) (* x x))) (x 2) + (accepted-delta 0.02) (f-prime-at-x 4) (delta 0.01)) (is (within-range-p (derivative-at f x delta) f-prime-at-x - 0.1)))) + accepted-delta)))) diff --git a/cl/tests/table.lisp b/cl/tests/table.lisp new file mode 100644 index 0000000..33d4e86 --- /dev/null +++ b/cl/tests/table.lisp @@ -0,0 +1,31 @@ +(defpackage lizfcm/tests.table + (:use :cl + :fiveam + :lizfcm.utils + :lizfcm/tests) + (:export :approx-suite)) +(in-package :lizfcm/tests.table) + +(def-suite table-suite + :in lizfcm-test-suite) +(in-suite table-suite) + +(defun fib (n) + (cond ((< n 2) n) + (t (+ (fib (- n 1)) (fib (- n 2)))))) + +(test table-of-fib-vals + :description "table generates correctly" + (let* ((headers '("n" "fib(n)")) + (n-values '((1) (2) (3) (4))) + (expected `(("n" "fib(n)") + (1 ,(fib 1)) + (2 ,(fib 2)) + (3 ,(fib 3)) + (4 ,(fib 4)))) + (tabled (lizfcm.utils:table (:headers headers + :domain-order (n) + :domain-values n-values) + (fib n)))) + (is (equal expected tabled)))) + |