r2953: *** empty log message ***

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index d31c51321494f3cb4b9422e2085c3d1dfe660a80..611dfd18668101f5e869b7636d5f081e74c464d0 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -1,4 +1,4 @@
-;;;; $Id: composite.lisp,v 1.1 2002/10/08 22:08:56 kevin Exp $
+;;;; $Id: composite.lisp,v 1.2 2002/10/09 00:34:47 kevin Exp $
 
 (in-package :umlisp)
 
@@ -6,10 +6,10 @@
 ;;; Semantic type constants
 
 (defun find-tui-word (words)
-  (gu:aif (car (find-usty-word words))
-       (tui gu::it)
+  (kmrcl:aif (car (find-usty-word words))
+       (tui kmrcl::it)
        nil))
-(gu:memoize 'find-tui-word)
+(kmrcl:memoize 'find-tui-word)
 
 (defun tui-disease-or-syndrome ()
   (find-tui-word "disease or syndrome"))
@@ -30,8 +30,8 @@
   (remove-duplicates 
    (filter
     #'(lambda (c) 
-       (gu:aif (funcall cui2-func c)
-            (let ((ucon2 (find-ucon-cui gu::it)))
+       (kmrcl:aif (funcall cui2-func c)
+            (let ((ucon2 (find-ucon-cui kmrcl::it)))
               (when (ucon-is-tui? ucon2 tui)
                 ucon2))
             nil))
@@ -124,8 +124,8 @@
 "Return sorted list of tuples with ucon and freq that have co-occuring concepts of semantic type tui" 
   (let ((ucon_freqs '())) 
     (dolist (ucoc (s#coc ucon)) 
-      (gu:aif (cui2 ucoc) 
-           (let ((ucon2 (find-ucon-cui gu::it))) 
+      (kmrcl:aif (cui2 ucoc) 
+           (let ((ucon2 (find-ucon-cui kmrcl::it))) 
              (when (ucon-is-tui? ucon2 tui)
               (push (make-instance 'ucon_freq :ucon ucon2 :freq (cof ucoc)) 
                     ucon_freqs)))))
@@ -157,15 +157,15 @@
   (let ((ucon_freqs (make-array (1+ (find-cui-max)) :initial-element nil)))
     (dolist (ucon (find-ucon-tui tui)) ;; for all disease-or-syn
       (dolist (ucon2 (funcall ucon2-tui-func ucon tui)) ;; for each related disease
-       (gu:aif (aref ucon_freqs (cui ucon2))
-            (setf (freq gu::it) (1+ (freq gu::it)))
+       (kmrcl:aif (aref ucon_freqs (cui ucon2))
+            (setf (freq kmrcl::it) (1+ (freq kmrcl::it)))
             (setf (aref ucon_freqs (cui ucon2)) 
               (make-instance 'ucon_freq :ucon ucon2 :freq 1)))))
     (let ((ucon_freq-list '()))
       (dotimes (i (find-cui-max))
        (declare (fixnum i))
-       (gu:awhen (aref ucon_freqs i)
-            (push gu::it ucon_freq-list)))
+       (kmrcl:awhen (aref ucon_freqs i)
+            (push kmrcl::it ucon_freq-list)))
       (sort ucon_freq-list #'> :key #'freq))))
 
 (defun find-ucon2_freq-rel-tui-all (tui)