projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3591: *** empty log message ***
[umlisp.git]
/
composite.lisp
diff --git
a/composite.lisp
b/composite.lisp
index 5bc641800983b158c94b28f68072ec1d76c0d90e..c9f8dc0deb4fe82a668d5309204caef64f16e5fc 100644
(file)
--- a/
composite.lisp
+++ b/
composite.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: composite.lisp,v 1.1
3 2002/11/24 05:24:26
kevin Exp $
+;;;; $Id: composite.lisp,v 1.1
7 2002/12/09 14:11:09
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; 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))
(defun find-tui-word (words)
(aif (car (find-usty-word words))
- (tui
:
it)
+ (tui it)
nil))
(memoize 'find-tui-word)
nil))
(memoize 'find-tui-word)
@@
-48,7
+48,7
@@
(filter
#'(lambda (c)
(aif (funcall cui2-func c)
(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))
(when (ucon-is-tui? ucon2 tui)
ucon2))
nil))
@@
-69,30
+69,30
@@
((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
(:metaclass hyperobject-class)
(:default-initargs :freq 0)
((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
(:metaclass hyperobject-class)
(:default-initargs :freq 0)
- (:
titl
e "Frequency class")
+ (:
user-nam
e "Frequency class")
(:print-slots freq)
(:print-slots freq)
- (:d
ocumenta
tion "Base class containing frequency slot, used for multi-inherited objects"))
+ (:d
escrip
tion "Base class containing frequency slot, used for multi-inherited objects"))
(defclass ucon_freq (ucon freq)
()
(:metaclass hyperobject-class)
(defclass ucon_freq (ucon freq)
()
(:metaclass hyperobject-class)
- (:
titl
e "Concept and Count")
+ (:
user-nam
e "Concept and Count")
(:print-slots cui freq pfstr)
(:print-slots cui freq pfstr)
- (:d
ocumenta
tion "Composite object of ucon/freq"))
+ (:d
escrip
tion "Composite object of ucon/freq"))
(defclass ustr_freq (ustr freq)
()
(:metaclass hyperobject-class)
(defclass ustr_freq (ustr freq)
()
(:metaclass hyperobject-class)
- (:
titl
e "String and Count")
+ (:
user-nam
e "String and Count")
(:print-slots sui freq stt lrl str)
(:print-slots sui freq stt lrl str)
- (:d
ocumenta
tion "Composite object of ustr/freq"))
+ (:d
escrip
tion "Composite object of ustr/freq"))
(defclass usty_freq (usty freq)
((freq :type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
(defclass usty_freq (usty freq)
((freq :type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
- (:
titl
e "Semantic Type and Count")
+ (:
user-nam
e "Semantic Type and Count")
(:print-slots tui freq sty)
(:print-slots tui freq sty)
- (:d
ocumenta
tion "Composite object of usty/freq"))
+ (:d
escrip
tion "Composite object of usty/freq"))
(defun find-usty_freq-all ()
(let ((usty_freqs '()))
(defun find-usty_freq-all ()
(let ((usty_freqs '()))
@@
-108,9
+108,9
@@
(defclass usrl_freq (usrl freq)
()
(:metaclass hyperobject-class)
(defclass usrl_freq (usrl freq)
()
(:metaclass hyperobject-class)
- (:
titl
e "Source and Count")
+ (:
user-nam
e "Source and Count")
(:print-slots sab freq srl)
(:print-slots sab freq srl)
- (:d
ocumenta
tion "Composite object of usrl/freq"))
+ (:d
escrip
tion "Composite object of usrl/freq"))
;; Frequency finding functions
;; Frequency finding functions
@@
-122,14
+122,14
@@
(format nil "select count(*) from MRSO where SAB='~a'"
(sab usrl)))))))
(push (make-instance 'usrl_freq :usrl usrl :freq freq) freqs)))
(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))
(aif (cui2 ucoc)
(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))
(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))
(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))
(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)))))
(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)
(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)
(sort ucon_freq-list #'> :key #'freq))))
(defun find-ucon2_freq-rel-tui-all (tui)