r3467: *** empty log message ***

diff --git a/composite.lisp b/composite.lisp
index 5bc641800983b158c94b28f68072ec1d76c0d90e..e5ffc20f7ce1f90e99368e106fd5f9198597f550 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.13 2002/11/24 05:24:26 kevin Exp $
+;;;; $Id: composite.lisp,v 1.14 2002/11/24 06:02:49 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -24,7 +24,7 @@
 
 (defun find-tui-word (words)
   (aif (car (find-usty-word words))
-       (tui :it)
+       (tui it)
        nil))
 (memoize 'find-tui-word)
 
@@ -48,7 +48,7 @@
    (filter
     #'(lambda (c) 
        (aif (funcall cui2-func c)
-            (let ((ucon2 (find-ucon-cui :it)))
+            (let ((ucon2 (find-ucon-cui it)))
               (when (ucon-is-tui? ucon2 tui)
                 ucon2))
             nil))
@@ -129,7 +129,7 @@
   (let ((ucon_freqs '())) 
     (dolist (ucoc (s#coc ucon)) 
       (aif (cui2 ucoc) 
-           (let ((ucon2 (find-ucon-cui :it))) 
+           (let ((ucon2 (find-ucon-cui it))) 
              (when (ucon-is-tui? ucon2 tui)
               (push (make-instance 'ucon_freq :cui (cui ucon2) :lrl (lrl ucon2)
                                    :pfstr (pfstr ucon2) :freq (cof ucoc)) 
@@ -163,7 +163,7 @@
     (dolist (ucon (find-ucon-tui tui)) ;; for all disease-or-syn
       (dolist (ucon2 (funcall ucon2-tui-func ucon tui)) ;; for each related disease
        (aif (aref ucon_freqs (cui ucon2))
-            (setf (freq :it) (1+ (freq :it)))
+            (setf (freq it) (1+ (freq it)))
             (setf (aref ucon_freqs (cui ucon2)) 
               (make-instance 'ucon_freq :cui (cui ucon2) :lrl (lrl ucon2)
                              :pfstr (pfstr ucon2) :freq 1)))))
@@ -171,7 +171,7 @@
       (dotimes (i (find-cui-max))
        (declare (fixnum i))
        (awhen (aref ucon_freqs i)
-            (push :it ucon_freq-list)))
+            (push it ucon_freq-list)))
       (sort ucon_freq-list #'> :key #'freq))))
 
 (defun find-ucon2_freq-rel-tui-all (tui)