X-Git-Url: http://git.kpe.io/?p=cl-photo.git;a=blobdiff_plain;f=tests.lisp;h=403977caed421e6b7dd114c62a4a75a49f0d89ee;hp=6405c27d943c550c63b2f8f7440c9927c6e194c8;hb=HEAD;hpb=0cf5cbde651377f998eb491ae7c89937d458daab

diff --git a/tests.lisp b/tests.lisp
index 6405c27..403977c 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -21,7 +21,7 @@
 (defun verify-results (alist blist)
   (every #'identity
          (mapcar
-          (lambda (a b) (numbers-within-percentage a b 0.001))
+          (lambda (a b) (numbers-within-percentage a b 0.01))
           alist blist)))
 
 (defmacro def-numeric-test (name test &rest values)
@@ -41,49 +41,96 @@
 
 (def-numeric-test
  :aov.1 (aov 50 36 24) 39.5977 26.9915 46.7930)
- 
-(def-numeric-test 
+
+(def-numeric-test
  :fov.1 (fov 50 24 16 :magnification 1 :units :mm)
  24 16 28.8444 1 100 100)
 
-(def-numeric-test 
+(def-numeric-test
  :fov.2 (fov 50 24 16 :magnification 1 :units :feet)
- 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
+  0.07874 0.052494 0.094634 1 0.328084 100)
 
-(def-numeric-test 
+(def-numeric-test
  :fov.3 (fov 50 24 16 :image-distance 100 :units :mm)
  24 16 28.8444 1 100 100)
 
-(def-numeric-test 
+(def-numeric-test
  :fov.4 (fov 50 24 16 :image-distance 100 :units :feet)
- 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
+  0.07874 0.052494 0.094634 1 0.328084 100)
 
-(def-numeric-test 
+(def-numeric-test
  :fov.5 (fov 50 24 16 :object-distance 100 :units :mm)
  24 16 28.8444 1 100 100)
 
-(def-numeric-test 
+(def-numeric-test
  :fov.6 (fov 50 24 16 :object-distance (cl-photo::mm->feet 100) :units :feet)
- 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
-
+  0.07874 0.052494 0.094634 1 0.328084 100)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.1 (magnification :focal-length 50 :image-distance 100 :units :mm) 1)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.2 (magnification :focal-length 50 :image-distance 100 :units :feet) 1)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.3 (magnification :focal-length 50 :object-distance 100 :units :mm) 1)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.4 (magnification :focal-length 50 :object-distance (cl-photo::mm->feet 100)
                        :units :feet) 1)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.5 (magnification :image-distance 100 :object-distance 100 :units :mm) 1)
 
-(def-numeric-test 
+(def-numeric-test
  :mag.6 (magnification :image-distance 100 :object-distance (cl-photo::mm->feet 100)
                        :units :feet) 1)
 
+(def-numeric-test
+    :cu.1 (close-up :focal-length 65 :magnification 5 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.2 (close-up :focal-length 65 :object-distance 78 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.3 (close-up :focal-length 65 :image-distance 390 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.4 (close-up :object-distance 78 :image-distance 390 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.5 (close-up :object-distance 78 :magnification 5 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.6 (close-up :image-distance 390 :magnification 5 :units :mm)
+  65 78 390 5 6)
+
+(def-numeric-test
+    :cu.7 (close-up :focal-length 65 :magnification 5 :units :feet)
+  65 0.2559055 390 5 6)
+
+(def-numeric-test
+    :cu.8 (close-up :focal-length 65 :object-distance 0.2559055 :units :feet)
+  65 0.2559055 390 5 6)
+
+(def-numeric-test
+    :cu.9 (close-up :focal-length 65 :image-distance 390 :units :feet)
+  65 0.2559055 390 5 6)
+
+(def-numeric-test
+    :cu.10 (close-up :object-distance 0.2559055 :image-distance 390 :units :feet)
+  65 0.2559055 390 5 6)
+
+(def-numeric-test
+    :cu.11 (close-up :object-distance 0.2559055 :magnification 5 :units :feet)
+  65 0.2559055 390 5 6)
+
+(def-numeric-test
+    :cu.12 (close-up :image-distance 390 :magnification 5 :units :feet)
+  65 0.2559055 390 5 6)
+