From 9b58980b6ae6abeb9aba762e76a879c339aa68b7 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 16 Sep 2006 14:25:35 +0000 Subject: [PATCH] r11163: fix paren --- class-support.lisp | 60 ++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/class-support.lisp b/class-support.lisp index 7948dec..709d462 100644 --- a/class-support.lisp +++ b/class-support.lisp @@ -376,41 +376,39 @@ (defun find-minimum-distance (anc1 anc2 &key (distance 0) (minimum 0) path) (cond - ((or (null anc1) (null anc2) nil) - ((and (atom (car anc1)) (atom (car anc2))) - (when (eql (cui ucon1) (cui ucon2)) - (return-from find-minimum-distance (values distance path))) - (incf distance) - (when (> distance minimum) - (return-from find-minimum-distance nil)) - (multiple-value-bind (dist1 path1) - (find-minimum-distance anc1 (cdr anc2) - :distance distance :minimum minimum - :path (list* anc1 path)) - (when (and dist1 (< dist1 minimum)) + ((or (null anc1) (null anc2) nil)) + ((and (atom (car anc1)) (atom (car anc2))) + (when (eql (cui ucon1) (cui ucon2)) + (return-from find-minimum-distance (values distance path))) + (incf distance) + (when (> distance minimum) + (return-from find-minimum-distance nil)) + (multiple-value-bind (dist1 path1) + (find-minimum-distance anc1 (cdr anc2) + :distance distance :minimum minimum + :path (list* anc1 path)) + (when (and dist1 (< dist1 minimum)) (setf minimum dist1 path path1))) - (multiple-value-bind (dist2 path2) - (find-minimum-distance (cdr anc1) anc2 - :distance distance :minimum minimum - :path (list* anc2 path)) - (when (and dist2 (< dist2 minimum)) - (setf minimum dist2 - path path2))) - (return-from find-minimum-distance (values distance path)) + (multiple-value-bind (dist2 path2) + (find-minimum-distance (cdr anc1) anc2 + :distance distance :minimum minimum + :path (list* anc2 path)) + (when (and dist2 (< dist2 minimum)) + (setf minimum dist2 + path path2))) + (return-from find-minimum-distance (values distance path)) + + + (min2 (find-minimum-distance + (cdr anc1) anc2 + :distance distance :minimum minimum + :path (list* anc2 path))) + (when (and min2 (< min2 minimum)) + (setf minimum min2 + path (list* anc2 path)))))) - (min2 (find-minimum-distance - (cdr anc1) anc2 - :distance distance :minimum minimum - :path (list* anc2 path)))) - - (when (and min2 (< min2 minimum)) - (setf minimum min2 - path (list* anc2 path))))) - - - ) (defun ucon-cdist (ucon1 ucon2 &key include-rb sab) "Compute James Cimino's CDist metric" -- 2.34.1