projects
/
umlisp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e64483a
)
r3463: *** empty log message ***
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 23 Nov 2002 20:59:47 +0000
(20:59 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 23 Nov 2002 20:59:47 +0000
(20:59 +0000)
composite.lisp
patch
|
blob
|
history
diff --git
a/composite.lisp
b/composite.lisp
index 263c28aaee17781e72ebcc41855beffc57b0ceb8..143b130b4c9f217c3931a3fedebfd4661f14099c 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.
9 2002/11/04 18:02:13
kevin Exp $
+;;;; $Id: composite.lisp,v 1.
10 2002/11/23 20:59:22
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.
@@
-65,62
+65,31
@@
;;; Composite Objects
;;; Composite Objects
-(defclass ucon_freq (umlsclass)
- ((ucon :type ucon :initarg :ucon :reader ucon)
- (freq :type fixnum :initarg :freq :accessor freq))
+(defclass ucon_freq (ucon)
+ ((freq :type integer :initarg :freq :accessor freq :print-formatter ho:comma-integer))
(:metaclass hyperobject-class)
(:metaclass hyperobject-class)
- (:default-initargs :
cui nil :pfstr nil :freq nil
)
+ (:default-initargs :
freq 0
)
(:title "Concept and Count")
(:title "Concept and Count")
- (:
fields (cui :string fmt-cui) (freq :fixnum) (pfstr :cdata)
)
+ (:
print-slots cui freq pfstr
)
(:ref-fields (cui find-ucon-cui))
(:documentation "Composite object of ucon/freq"))
(: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))
+(defclass ustr_freq (ustr)
+ ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
(:metaclass hyperobject-class)
(:metaclass hyperobject-class)
- (:default-initargs :
cui nil :pfstr nil :freq nil
)
+ (:default-initargs :
freq 0
)
(:title "String and Count")
(:title "String and Count")
- (:fields (sui :string fmt-sui) (freq :fixnum) (stt :string) (lrl :fixnum) (str :cdata))
- (:ref-fields (sui find-ustr-sui))
+ (:print-slots sui freq stt lrl str)
(:documentation "Composite object of ustr/freq"))
(: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))
+(defclass usty_freq (usty)
+ ((freq :type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
(:metaclass hyperobject-class)
- (:default-initargs :
usty nil :freq nil
)
+ (:default-initargs :
freq 0
)
(:title "Semantic Type and Count")
(:title "Semantic Type and Count")
-;; (:ref-fields (tui find-ucon-tui "subobjects=no"))
- (:ref-fields (tui find-ucon-tui))
- (:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
+ (:print-slots tui freq sty))
(:documentation "Composite object of usty/freq"))
(: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"))
(defun find-usty_freq-all ()
(let ((usty_freqs '()))
(dolist (tuple (mutex-sql-query "select distinct TUI from MRSTY"))
@@
-132,23
+101,14
@@
(sort usty_freqs #'> :key #'freq)))
(sort usty_freqs #'> :key #'freq)))
-(defclass usrl_freq (umlsclass)
- ((usrl :type usrl :initarg :usrl :reader usrl)
- (freq :type fixnum :initarg :freq :accessor freq))
+(defclass usrl_freq (usrl)
+ ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
(:metaclass hyperobject-class)
(:metaclass hyperobject-class)
- (:default-initargs :
usrl nil :freq nil
)
+ (:default-initargs :
freq 0
)
(:title "Source and Count")
(:title "Source and Count")
- (:ref-fields (sab find-ustr-sab))
- (:fields (sab :string) (freq :commainteger) (srl :fixnum))
+ (:print-slots sab freq srl)
(:documentation "Composite object of usrl/freq"))
(:documentation "Composite object of usrl/freq"))
-(defmethod sab ((s usrl_freq))
- (sab (usrl s)))
-
-(defmethod srl ((s usrl_freq))
- (srl (usrl s)))
-
-
;; Frequency finding functions
(defun find-usrl_freq-all ()
;; Frequency finding functions
(defun find-usrl_freq-all ()