X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=composite.lisp;h=0489853ff1fc11461c39d033620e6cc5ecc04bb8;hb=9efb1ca7c39cd86f8730fbf7031a86a7876a57ea;hp=9b5f60199a65eede49754dfa5d8624bf178cc0a6;hpb=48b70ea69d92b01f3e3795855581f8af8869b01f;p=umlisp.git

diff --git a/composite.lisp b/composite.lisp
index 9b5f601..0489853 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.6 2002/10/16 16:05:23 kevin Exp $
+;;;; $Id: composite.lisp,v 1.18 2002/12/13 05:43:38 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,11 +47,10 @@
   (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))
+		 ucon2)) nil))
     (funcall related-con-func ucon))
    :key #'cui))
 
@@ -65,60 +64,34 @@
 
 ;;; Composite Objects
 
-(defclass ucon_freq (umlsclass)
-  ((ucon :type ucon :initarg :ucon :reader ucon)
-   (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
-  (:default-initargs :cui nil :pfstr nil :freq nil)
-  (:title "Concept and Count")
-  (:fields (cui :string fmt-cui) (freq :fixnum) (pfstr :cdata))
-  (:ref-fields (cui find-ucon-cui))
-  (:documentation "Composite object of ucon/freq"))
-
-(defun ucon_freq-cui (c)
-  (cui (ucon c)))
-
-(defun ucon_freq-pfstr (c)
-  (pfstr (ucon c)))
-
-(defclass ustr_freq (umlsclass)
-  ((ustr :type ustr :initarg :ustr :reader ustr)
-   (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
-  (:default-initargs :cui nil :pfstr nil :freq nil)
-  (:title "String and Count")
-  (:fields (sui :string fmt-sui) (freq :fixnum) (stt :string) (lrl :fixnum) (str :cdata))
-  (:ref-fields (sui find-ustr-sui))
-  (:documentation "Composite object of ustr/freq"))
-
-(defun ustr_freq-sui (s)
-  (sui (ustr s)))
-
-(defun ustr_freq-str (s)
-  (str (ustr s)))
-
-(defun ustr_freq-lrl (s)
-  (lrl (ustr s)))
-
-(defun ustr_freq-stt (s)
-  (stt (ustr s)))
-
-(defclass usty_freq (umlsclass)
-  ((usty :type usty :initarg :usty :reader usty)
-   (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
-  (:default-initargs :usty nil :freq nil)
-  (:title "Semantic Type and Count")
-  (:ref-fields (tui find-ucon-tui "subobjects=no"))
-  (:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
-  (:documentation "Composite object of usty/freq"))
-
-(defmethod tui ((s usty_freq))
-  (usty-tui (usty_freq-usty s)))
-
-(defmethod sty ((s usty_freq))
-  (usty-sty (usty_freq-usty s)))
-
+(defclass freq (hyperobject)
+  ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
+  (:metaclass hyperobject-class)
+  (:default-initargs :freq 0)
+  (:user-name "Frequency class")
+  (:default-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")
+  (:default-print-slots cui freq pfstr)
+  (:description "Composite object of ucon/freq"))
+
+(defclass ustr_freq (ustr freq)
+  ()
+  (:metaclass hyperobject-class)
+  (:user-name "String and Count")
+  (:default-print-slots sui freq stt lrl str)
+  (:description "Composite object of ustr/freq"))
+
+(defclass usty_freq (usty freq)
+  ((freq :type fixnum :initarg :freq :accessor freq))
+  (:metaclass hyperobject-class)
+  (:user-name "Semantic Type and Count")
+  (:default-print-slots tui freq sty)
+  (:description "Composite object of usty/freq"))
 
 (defun find-usty_freq-all ()
   (let ((usty_freqs '()))
@@ -131,22 +104,12 @@
     (sort usty_freqs #'> :key #'freq)))
 
 
-(defclass usrl_freq (umlsclass)
-  ((usrl :type usrl :initarg :usrl :reader usrl)
-   (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
-  (:default-initargs :usrl nil :freq nil)
-  (:title "Source and Count")
-  (:ref-fields (sab find-ustr-sab))
-  (:fields (sab :string) (freq :commainteger) (srl :fixnum))
-  (:documentation "Composite object of usrl/freq"))
-
-(defmethod sab ((s usrl_freq))
-  (sab (usrl s)))
- 
-(defmethod srl ((s usrl_freq))
-  (srl (usrl s)))
-
+(defclass usrl_freq (usrl freq)
+  ()
+  (:metaclass hyperobject-class)
+  (:user-name "Source and Count")
+  (:default-print-slots sab freq srl)
+  (:description "Composite object of usrl/freq"))
 
 ;; Frequency finding functions
 
@@ -158,16 +121,17 @@
 			  (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 :ucon ucon2 :freq (cof ucoc)) 
+	       (push (make-instance 'ucon_freq :cui (cui ucon2) :lrl (lrl ucon2)
+				    :pfstr (pfstr ucon2) :freq (cof ucoc)) 
 		     ucon_freqs)))))
     (setq ucon_freqs (delete-duplicates ucon_freqs :key #'cui))
     (sort ucon_freqs #'> :key #'freq)))
@@ -197,15 +161,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 :ucon ucon2 :freq 1)))))
+	       (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)
@@ -215,9 +180,9 @@
 (defun find-ucon2_freq-coc-tui-all (tui)
   (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
 
-#+cmu
+#+(or cmu scl)
 (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
   (let ((cl #+cmu (pcl:find-class c)
-	    #+sbcl (sb-pcl:find-class c)))
+	    #+scl (find-class c)))
     #+cmu (pcl:finalize-inheritance cl)
-    #+sbcl (sb-pcl:finalize-inheritance cl)))
+    #+scl (clos:finalize-inheritance cl)))