X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=composite.lisp;h=c9f8dc0deb4fe82a668d5309204caef64f16e5fc;hb=baef3e3eba503d04fe6d19ac3087bf9d3dbc37b9;hp=ddda98f6cd9aeda7179ed11c0e77e27794b4b74c;hpb=d17db83f9f6dc74ea41cc960770dcbfafa3fef30;p=umlisp.git

diff --git a/composite.lisp b/composite.lisp
index ddda98f..c9f8dc0 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.11 2002/11/23 22:15:13 kevin Exp $
+;;;; $Id: composite.lisp,v 1.17 2002/12/09 14:11:09 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -23,10 +23,10 @@
 ;;; Semantic type constants
 
 (defun find-tui-word (words)
-  (kmrcl:aif (car (find-usty-word words))
-       (tui kmrcl::it)
+  (aif (car (find-usty-word words))
+       (tui it)
        nil))
-(kmrcl:memoize 'find-tui-word)
+(memoize 'find-tui-word)
 
 (defun tui-disease-or-syndrome ()
   (find-tui-word "disease or syndrome"))
@@ -47,8 +47,8 @@
   (remove-duplicates 
    (filter
     #'(lambda (c) 
-	(kmrcl:aif (funcall cui2-func c)
-	     (let ((ucon2 (find-ucon-cui kmrcl::it)))
+	(aif (funcall cui2-func c)
+	     (let ((ucon2 (find-ucon-cui it)))
  	       (when (ucon-is-tui? ucon2 tui)
 		 ucon2))
 	     nil))
@@ -65,29 +65,34 @@
 
 ;;; Composite Objects
 
-(defclass ucon_freq (ucon)
-  ((freq :type integer :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+(defclass freq (hyperobject)
+  ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
-  (:title "Concept and Count")
+  (:user-name "Frequency class")
+  (:print-slots freq)
+  (:description "Base class containing frequency slot, used for multi-inherited objects"))
+
+(defclass ucon_freq (ucon freq)
+  ()
+  (:metaclass hyperobject-class)
+  (:user-name "Concept and Count")
   (:print-slots cui freq pfstr)
-  (:documentation "Composite object of ucon/freq"))
+  (:description "Composite object of ucon/freq"))
 
-(defclass ustr_freq (ustr)
-  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+(defclass ustr_freq (ustr freq)
+  ()
   (:metaclass hyperobject-class)
-  (:default-initargs :freq 0)
-  (:title "String and Count")
+  (:user-name "String and Count")
   (:print-slots sui freq stt lrl str)
-  (:documentation "Composite object of ustr/freq"))
+  (:description "Composite object of ustr/freq"))
 
-(defclass usty_freq (usty)
+(defclass usty_freq (usty freq)
   ((freq :type fixnum :initarg :freq :accessor freq))
   (:metaclass hyperobject-class)
-  (:default-initargs :freq 0)
-  (:title "Semantic Type and Count")
+  (:user-name "Semantic Type and Count")
   (:print-slots tui freq sty)
-  (:documentation "Composite object of usty/freq"))
+  (:description "Composite object of usty/freq"))
 
 (defun find-usty_freq-all ()
   (let ((usty_freqs '()))
@@ -100,13 +105,12 @@
     (sort usty_freqs #'> :key #'freq)))
 
 
-(defclass usrl_freq (usrl)
-  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+(defclass usrl_freq (usrl freq)
+  ()
   (:metaclass hyperobject-class)
-  (:default-initargs :freq 0)
-  (:title "Source and Count")
+  (:user-name "Source and Count")
   (:print-slots sab freq srl)
-  (:documentation "Composite object of usrl/freq"))
+  (:description "Composite object of usrl/freq"))
 
 ;; Frequency finding functions
 
@@ -118,14 +122,14 @@
 			  (format nil "select count(*) from MRSO where SAB='~a'" 
 				  (sab usrl)))))))
 	(push (make-instance 'usrl_freq :usrl usrl :freq freq) freqs)))
-    (sort freqs #'> :key #'usrl_freq-freq)))
+    (sort freqs #'> :key #'freq)))
 
 (defun find-ucon2_freq-coc-tui (ucon tui)
 "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)) 
-      (kmrcl:aif (cui2 ucoc) 
-           (let ((ucon2 (find-ucon-cui kmrcl::it))) 
+      (aif (cui2 ucoc) 
+           (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)) 
@@ -158,16 +162,16 @@
   (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
-	(kmrcl:aif (aref ucon_freqs (cui ucon2))
-	     (setf (freq kmrcl::it) (1+ (freq kmrcl::it)))
+	(aif (aref ucon_freqs (cui ucon2))
+	     (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)))))
     (let ((ucon_freq-list '()))
       (dotimes (i (find-cui-max))
 	(declare (fixnum i))
-	(kmrcl:awhen (aref ucon_freqs i)
-	     (push kmrcl::it ucon_freq-list)))
+	(awhen (aref ucon_freqs i)
+	     (push it ucon_freq-list)))
       (sort ucon_freq-list #'> :key #'freq))))
 
 (defun find-ucon2_freq-rel-tui-all (tui)