fix/add tests

Author: 3b

intersect-regression.lisp

@@ -76,26 +76,28 @@
            (if (= (length y) 6)
                `(b2 ,@y)
                `(s ,@y))))
-    `(ix ,(x a) ,(x b) ,@r)
-    `(ix ,(x b) ,(x a) ,@(loop for v in r
-                               collect (if (= 4 (length v))
-                                           (let ((c (copy-seq v)))
-                                             (rotatef (aref c 2) (aref c 3))
-                                             c)
-                                           v)))))
+    `(progn
+       (ix ,(x a) ,(x b) ,@r)
+       (ix ,(x b) ,(x a) ,@(loop for v in r
+                                 collect (if (= 4 (length v))
+                                             (let ((c (copy-seq v)))
+                                               (rotatef (aref c 2) (aref c 3))
+                                               c)
+                                             v))))))
 (defmacro ix2r (a a0 a1 b b0 b1 &rest r)
   (flet ((x (y)
            (if (= (length y) 6)
                `(b2 ,@y)
                `(s ,@y))))
-    `(ixr ,(x a) ,a0 ,a1 ,(x b) ,b0 ,b1 ,@r)
-    `(ixr ,(x b) ,b0 ,b1 ,(x a) ,a0 ,a1
-          ,@(loop for v in r
-                  collect (if (= 4 (length v))
-                              (let ((c (copy-seq v)))
-                                (rotatef (aref c 2) (aref c 3))
-                                c)
-                              v)))))
+    `(progn
+       (ixr ,(x a) ,a0 ,a1 ,(x b) ,b0 ,b1 ,@r)
+       (ixr ,(x b) ,b0 ,b1 ,(x a) ,a0 ,a1
+            ,@(loop for v in r
+                    collect (if (= 4 (length v))
+                                (let ((c (copy-seq v)))
+                                  (rotatef (aref c 2) (aref c 3))
+                                  c)
+                                v))))))
 
 (defun check-bclip (a a0 a1 b b0 b1)
   (let ((i (finish (qi::intersect
@@ -666,8 +668,31 @@
        #(184.0d0 361.0d0 0d0 1.0d0))
   (ix2 (195 339 195 338 176 288)
        (196 -137 195 339)
-       #(195.0d0 339.0d0 0d0 1.0d0)))
-)
+       #(195.0d0 339.0d0 0d0 1.0d0))
+  (ix2 (1578 1403 1664 1415 1689 1409)
+       (1689 1409 1663 1415 1578 1403)
+       #(1665.333789528964d0 1410.999892664994d0
+         0.6642247297524433d0 0.33089139641883003d0)
+       #(1578.0d0 1403.0d0 0.0d0 1.0d0)
+       #(1689.0d0 1409.0d0 1.0d0 0.0d0))
+
+  ;; 1689,1409... split #(1665.111111111111d0 1411.0d0) @ 0.3333333333333333d0
+  ;; 1578,1403... split #(1665.5555555555557d0 1411.0d0)@ 0.6666666666666666d0
+  (ix2r (1578 1403 1664 1415 1689 1409) 0 0.6666666666666666d0
+        (1689 1409 1663 1415 1578 1403) 0 0.3333333333333333d0
+        #(1665.3337895289578d0 1410.999892664994d0
+          0.664224729752739d0 0.33089139641926213d0))
+  (ix2r (1578 1403 1664 1415 1689 1409) 1 0.6666666666666666d0
+        (1689 1409 1663 1415 1578 1403) 0 0.3333333333333333d0
+        #(1689.0d0 1409.0d0 1.0d0 0.0d0))
+  (ix2r (1578 1403 1664 1415 1689 1409) 0 0.6666666666666666d0
+        (1689 1409 1663 1415 1578 1403) 1 0.3333333333333333d0
+        #(1578.0d0 1403.0d0 0.0d0 1.0d0))
+  (ix2r (1578 1403 1664 1415 1689 1409) 1 0.6666666666666666d0
+        (1689 1409 1663 1415 1578 1403) 1 0.3333333333333333d0
+        NIL)
+
+  )
 #++
 (test 'intersect-regression)