From 1a8c81d07efe55c5a6909aff32359d4b8866af1c Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Wed, 27 Sep 2023 09:53:37 -0600 Subject: keep unit tests but make directory structure more consistent with requirements i did not read --- src/approx/derivative.lisp | 9 +++++++++ src/approx/maceps.lisp | 11 +++++++++++ src/approx/package.lisp | 5 +++++ src/package.lisp | 7 +++++++ src/utils/package.lisp | 5 +++++ src/utils/table.lisp | 11 +++++++++++ src/utils/within-range.lisp | 5 +++++ src/vector/distance.lisp | 6 ++++++ src/vector/norm.lisp | 17 +++++++++++++++++ src/vector/package.lisp | 7 +++++++ 10 files changed, 83 insertions(+) create mode 100644 src/approx/derivative.lisp create mode 100644 src/approx/maceps.lisp create mode 100644 src/approx/package.lisp create mode 100644 src/package.lisp create mode 100644 src/utils/package.lisp create mode 100644 src/utils/table.lisp create mode 100644 src/utils/within-range.lisp create mode 100644 src/vector/distance.lisp create mode 100644 src/vector/norm.lisp create mode 100644 src/vector/package.lisp (limited to 'src') diff --git a/src/approx/derivative.lisp b/src/approx/derivative.lisp new file mode 100644 index 0000000..02fcb4c --- /dev/null +++ b/src/approx/derivative.lisp @@ -0,0 +1,9 @@ +(in-package :lizfcm.approx) + +(defun derivative-at (f x &optional (delta 0.01)) + (let* ((x2 (+ x delta)) + (x1 (- x delta)) + (y2 (apply f (list x2))) + (y1 (apply f (list x1)))) + (/ (- y2 y1) + (- x2 x1)))) diff --git a/src/approx/maceps.lisp b/src/approx/maceps.lisp new file mode 100644 index 0000000..ad234e8 --- /dev/null +++ b/src/approx/maceps.lisp @@ -0,0 +1,11 @@ +(in-package :lizfcm.approx) + +(defun compute-maceps (f a init) + (let ((h init) + (err init)) + (loop while (> err 0) + do + (setf h (/ h 2) + err (abs (- (funcall f (+ a h)) + (funcall f a)))) + collect (list a h err)))) diff --git a/src/approx/package.lisp b/src/approx/package.lisp new file mode 100644 index 0000000..c11eb60 --- /dev/null +++ b/src/approx/package.lisp @@ -0,0 +1,5 @@ +(in-package :cl-user) +(defpackage lizfcm.approx + (:use :cl) + (:export :derivative-at + :compute-maceps)) diff --git a/src/package.lisp b/src/package.lisp new file mode 100644 index 0000000..88b10eb --- /dev/null +++ b/src/package.lisp @@ -0,0 +1,7 @@ +(in-package :cl-user) +(defpackage lizfcm.vector + (:use :cl) + (:export + :n-norm + :max-norm + :distance)) diff --git a/src/utils/package.lisp b/src/utils/package.lisp new file mode 100644 index 0000000..bdd5589 --- /dev/null +++ b/src/utils/package.lisp @@ -0,0 +1,5 @@ +(in-package :cl-user) +(defpackage lizfcm.utils + (:use :cl) + (:export :within-range-p + :table)) diff --git a/src/utils/table.lisp b/src/utils/table.lisp new file mode 100644 index 0000000..e96f37b --- /dev/null +++ b/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/src/utils/within-range.lisp b/src/utils/within-range.lisp new file mode 100644 index 0000000..9a0b762 --- /dev/null +++ b/src/utils/within-range.lisp @@ -0,0 +1,5 @@ +(in-package :lizfcm.utils) + +(defun within-range-p (x true-value delta) + (and (< x (+ true-value delta)) + (> x (- true-value delta)))) diff --git a/src/vector/distance.lisp b/src/vector/distance.lisp new file mode 100644 index 0000000..74631ce --- /dev/null +++ b/src/vector/distance.lisp @@ -0,0 +1,6 @@ +(in-package :lizfcm.vector) + +(defun distance (v1 v2 norm) + (let* ((d (mapcar #'- v1 v2)) + (length (funcall norm d))) + length)) diff --git a/src/vector/norm.lisp b/src/vector/norm.lisp new file mode 100644 index 0000000..2158296 --- /dev/null +++ b/src/vector/norm.lisp @@ -0,0 +1,17 @@ +(in-package :lizfcm.vector) + +(defun p-norm (p) + (lambda (v) + (expt + (reduce (lambda (acc x) + (+ acc x)) + (mapcar (lambda (x) + (abs + (expt x p))) + v)) + (/ 1 p)))) + +(defun max-norm (v) + (reduce (lambda (acc x) + (max acc x)) + v)) diff --git a/src/vector/package.lisp b/src/vector/package.lisp new file mode 100644 index 0000000..009b190 --- /dev/null +++ b/src/vector/package.lisp @@ -0,0 +1,7 @@ +(in-package :cl-user) +(defpackage lizfcm.vector + (:use :cl) + (:export + :p-norm + :max-norm + :distance)) -- cgit v1.2.3-70-g09d2