Changeset 27421 in project

Timestamp:

09/14/12 08:11:12 (9 years ago)

Author:

Ivan Raikov

Message:

kd-tree: removed vestigial support for scaled distance functions

Location:

release/4/kd-tree/trunk

Files:

• kd-tree.scm (modified) (5 diffs)
• kd-tree.setup (modified) (1 diff)
• tests/run.scm (modified) (2 diffs)

release/4/kd-tree/trunk/kd-tree.scm

@@ -92 +92 @@
     dist2 ;; Point * Point -> Double
 
-    ;; returns the scaled squared distance between two points.
-    sdist2 ;; Point * Point * [Int] -> Double
-
     ;; returns 0, negative or positive number depending on the
     ;; distance between two points
@@ -131 +128 @@
                 (sum (list-tabulate (dimension a) diff2)))))
 
-           (sdist2 
-            (lambda (factors)
-              (let ((factors2 (map (lambda (n) (* n n)) factors)))
-                (lambda (a b)
-                  (let ((diff2 (lambda (i) (let ((v (- (coord i a) (coord i b)))) (* v v)))))
-                    (let ((v (sum (map * (list-tabulate (dimension a) diff2) factors2))))
-                      v))))))
-
            (compare-distance
             (lambda (p a b . reltol)
@@ -153 +142 @@
             
     (make-<Point> 
-     dimension coord compare-coord dist2 sdist2 compare-distance)
+     dimension coord compare-coord dist2 compare-distance)
     ))
 
@@ -573 +562 @@
                        ))
               ))
-      (lambda (t radius probe #!key (factors #f) (with-distance? #f))
-        (let* ((dist-fn (if factors (sdist2 factors) dist2))
+      (lambda (t radius probe #!key (with-distance? #f))
+        (let* ((dist-fn dist2)
                (filter-fn (if with-distance? 
                               (lambda (probe pp d2) (filter-map (lambda (p) (let ((pd (dist-fn probe p)))
@@ -623 +612 @@
                        ))
               ))
-      (lambda (t radius probe #!key (factors #f) (with-distance? #f))
-        (let* ((dist-fn (if factors (sdist2 factors) dist2))
+      (lambda (t radius probe #!key (with-distance? #f))
+        (let* ((dist-fn dist2)
                (filter-fn (if with-distance? 
                               (lambda (probe pp ii vv r2)

release/4/kd-tree/trunk/kd-tree.setup

@@ -16 +16 @@
   
   ;; Assoc list with properties for your extension:
-  '((version 4.1)
+  '((version 4.2)
     ))

release/4/kd-tree/trunk/tests/run.scm

@@ -28 +28 @@
                     sorted-points)
                   )))
-
-#|
-    (define scale-factors '(1.0 0.5 1.0))
-
-    (define (compare-scaled-distance p a b . reltol)
-      (let ((dist2 (sdist2 scale-factors)))
-        (let ((delta (- (dist2 p a) (dist2 p b))))
-          (if (null? reltol) 
-              delta 
-              (if (<= delta (car reltol)) 0 delta)))))
-
-    (define (sort-scaled-points pts) 
-      (sort pts (lambda (a b) (negative? (compare-scaled-distance x a b)))))
-    
-    (define srnn (let ((r2 (* r r))  (dist2 (sdist2 scale-factors)))
-                   (sort-scaled-points 
-                    (filter
-                     (lambda (y) (<= (dist2 x y) r2))
-                     (sort-scaled-points sorted-points))
-                    )))
-|#
     
     (test-group
@@ -84 +63 @@
            (sort-points (kd-tree-near-neighbors t r x)))
 
-#|
-     (test "near-neighbors scaled"
-           srnn
-           (sort-scaled-points (kd-tree-near-neighbors t r x factors: scale-factors)))
-|#
      (test "slice"
            sliced-points