projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3466: *** empty log message ***
[umlisp.git]
/
composite.lisp
diff --git
a/composite.lisp
b/composite.lisp
index 143b130b4c9f217c3931a3fedebfd4661f14099c..5bc641800983b158c94b28f68072ec1d76c0d90e 100644
(file)
--- 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
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-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
0 2002/11/23 20:59:22
kevin Exp $
+;;;; $Id: composite.lisp,v 1.1
3 2002/11/24 05:24:26
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.
@@
-23,10
+23,10
@@
;;; Semantic type constants
(defun find-tui-word (words)
;;; 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))
nil))
-(
kmrcl:
memoize 'find-tui-word)
+(memoize 'find-tui-word)
(defun tui-disease-or-syndrome ()
(find-tui-word "disease or syndrome"))
(defun tui-disease-or-syndrome ()
(find-tui-word "disease or syndrome"))
@@
-47,8
+47,8
@@
(remove-duplicates
(filter
#'(lambda (c)
(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))
(when (ucon-is-tui? ucon2 tui)
ucon2))
nil))
@@
-65,29
+65,33
@@
;;; Composite Objects
;;; 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)
(:metaclass hyperobject-class)
(:default-initargs :freq 0)
+ (:title "Frequency class")
+ (:print-slots freq)
+ (:documentation "Base class containing frequency slot, used for multi-inherited objects"))
+
+(defclass ucon_freq (ucon freq)
+ ()
+ (:metaclass hyperobject-class)
(:title "Concept and Count")
(:print-slots cui freq pfstr)
(:title "Concept and Count")
(:print-slots cui freq pfstr)
- (:ref-fields (cui find-ucon-cui))
(:documentation "Composite object of ucon/freq"))
(:documentation "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)
(:metaclass hyperobject-class)
- (:default-initargs :freq 0)
(:title "String and Count")
(:print-slots sui freq stt lrl str)
(:documentation "Composite object of ustr/freq"))
(:title "String and Count")
(:print-slots sui freq stt lrl str)
(:documentation "Composite object of ustr/freq"))
-(defclass usty_freq (usty)
+(defclass usty_freq (usty
freq
)
((freq :type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
((freq :type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
- (:default-initargs :freq 0)
(:title "Semantic Type and Count")
(:title "Semantic Type and Count")
- (:print-slots tui freq sty)
)
+ (:print-slots tui freq sty)
(:documentation "Composite object of usty/freq"))
(defun find-usty_freq-all ()
(:documentation "Composite object of usty/freq"))
(defun find-usty_freq-all ()
@@
-101,10
+105,9
@@
(sort usty_freqs #'> :key #'freq)))
(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)
(:metaclass hyperobject-class)
- (:default-initargs :freq 0)
(:title "Source and Count")
(:print-slots sab freq srl)
(:documentation "Composite object of usrl/freq"))
(:title "Source and Count")
(:print-slots sab freq srl)
(:documentation "Composite object of usrl/freq"))
@@
-125,10
+128,11
@@
"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))
"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)
(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)))
ucon_freqs)))))
(setq ucon_freqs (delete-duplicates ucon_freqs :key #'cui))
(sort ucon_freqs #'> :key #'freq)))
@@
-158,15
+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
(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))
(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))
(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)
(sort ucon_freq-list #'> :key #'freq))))
(defun find-ucon2_freq-rel-tui-all (tui)