X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=composite.lisp;h=007c5725988df14e32624645de3cde53efd98ec2;hb=1b5b2e75a888e011706359e341b622a22f2023ea;hp=4dcc194f03fb0cbae8693c429b465a78518aa6e5;hpb=452d8de6a4083dec69347f3cafb49d0b9d5cd7b0;p=umlisp.git

diff --git a/composite.lisp b/composite.lisp
index 4dcc194..007c572 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.5 2002/10/14 15:03:43 kevin Exp $
+;;;; $Id: composite.lisp,v 1.8 2002/10/18 07:28:57 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -109,10 +109,18 @@
   (:metaclass kmrcl:ml-class)
   (:default-initargs :usty nil :freq nil)
   (:title "Semantic Type and Count")
-  (:ref-fields (tui find-ucon-tui "subobjects=no"))
+;;  (:ref-fields (tui find-ucon-tui "subobjects=no"))
+  (:ref-fields (tui find-ucon-tui))
   (:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
   (:documentation "Composite object of usty/freq"))
 
+(defmethod tui ((s usty_freq))
+  (tui (usty s)))
+
+(defmethod sty ((s usty_freq))
+  (sty (usty s)))
+
+
 (defun find-usty_freq-all ()
   (let ((usty_freqs '()))
     (dolist (tuple (mutex-sql-query "select distinct TUI from MRSTY"))
@@ -123,11 +131,6 @@
 	(push (make-instance 'usty_freq :usty (find-usty-tui tui) :freq freq) usty_freqs)))
     (sort usty_freqs #'> :key #'freq)))
 
-(defun usty_freq-tui (s)
-  (tui (usty s)))
- 
-(defun usty_freq-sty (s)
-  (sty (usty s)))
 
 (defclass usrl_freq (umlsclass)
   ((usrl :type usrl :initarg :usrl :reader usrl)
@@ -139,14 +142,25 @@
   (:fields (sab :string) (freq :commainteger) (srl :fixnum))
   (:documentation "Composite object of usrl/freq"))
 
-(defun usrl_freq-sab (s)
+(defmethod sab ((s usrl_freq))
   (sab (usrl s)))
  
-(defun usrl_freq-srl (s)
+(defmethod srl ((s usrl_freq))
   (srl (usrl s)))
 
 
 ;; Frequency finding functions
+
+(defun find-usrl_freq-all ()
+  (let ((freqs '()))
+    (dolist (usrl (find-usrl-all))
+      (let ((freq (ensure-integer 
+		   (caar (mutex-sql-query 
+			  (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)))
+
 (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 '())) 
@@ -202,9 +216,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)))