projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3474: *** empty log message ***
[umlisp.git]
/
classes.lisp
diff --git
a/classes.lisp
b/classes.lisp
index e1cf6ccf863becf926689486fff7aebf178b36d3..2ca6b778f1484cd0c3dc01c3ddb8912ebb30c873 100644
(file)
--- a/
classes.lisp
+++ b/
classes.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: classes.lisp,v 1.1
3 2002/11/23 18:41:41
kevin Exp $
+;;;; $Id: classes.lisp,v 1.1
7 2002/11/25 07:45:36
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.
@@
-22,7
+22,7
@@
(defclass umlsclass (hyperobject)
()
(:metaclass hyperobject-class)
(defclass umlsclass (hyperobject)
()
(:metaclass hyperobject-class)
- (:d
ocumenta
tion "Parent class of all UMLS objects. It is based on the HYPEROBJECT-CLASS metaclass that provides object printing functions."))
+ (:d
escrip
tion "Parent class of all UMLS objects. It is based on the HYPEROBJECT-CLASS metaclass that provides object printing functions."))
(defclass usrl (umlsclass)
(defclass usrl (umlsclass)
@@
-32,7
+32,7
@@
(:default-initargs :sab nil :srl nil)
(:title "Source Restriction Level")
(:print-slots sab srl)
(:default-initargs :sab nil :srl nil)
(:title "Source Restriction Level")
(:print-slots sab srl)
- (:d
ocumenta
tion "Custom Table: Source Restriction Level"))
+ (:d
escrip
tion "Custom Table: Source Restriction Level"))
(defclass urank (umlsclass)
(defclass urank (umlsclass)
@@
-78,8
+78,8
@@
(slc :type cdata :initarg :slc :reader slc)
(scc :type cdata :initarg :scc :reader scc)
(srl :type fixnum :initarg :srl :reader srl)
(slc :type cdata :initarg :slc :reader slc)
(scc :type cdata :initarg :scc :reader scc)
(srl :type fixnum :initarg :srl :reader srl)
- (tfr :type fixnum :initarg :tfr :reader tfr :print-formatter
ho:
comma-integer)
- (cfr :type fixnum :initarg :cfr :reader cfr :print-formatter
ho:
comma-integer)
+ (tfr :type fixnum :initarg :tfr :reader tfr :print-formatter
fmt-
comma-integer)
+ (cfr :type fixnum :initarg :cfr :reader cfr :print-formatter
fmt-
comma-integer)
(cxty :type string :initarg :cxty :reader cxty)
(ttyl :type string :initarg :ttyl :reader ttyl)
(atnl :type string :initarg :atnl :reader atnl)
(cxty :type string :initarg :cxty :reader cxty)
(ttyl :type string :initarg :ttyl :reader ttyl)
(atnl :type string :initarg :atnl :reader atnl)
@@
-94,8
+94,8
@@
:ttyl nil :atnl nil :lat nil :cenc nil :curver nil
:sabin nil)
(:title "Source Abbreviation")
:ttyl nil :atnl nil :lat nil :cenc nil :curver nil
:sabin nil)
(:title "Source Abbreviation")
- (:print-slots vcui rcui vsab rsab s
a
n sf sver mstart mend imeta
- rmeta slc scc srl tfr c
s
r cxty ttyl atnl lat cenc
+ (:print-slots vcui rcui vsab rsab s
o
n sf sver mstart mend imeta
+ rmeta slc scc srl tfr c
f
r cxty ttyl atnl lat cenc
curver sabin))
(defclass uso (umlsclass)
curver sabin))
(defclass uso (umlsclass)
@@
-124,7
+124,7
@@
(:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
:cui2 nil :hcd nil :rela nil :xc nil)
(:title "Context")
(:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
:cui2 nil :hcd nil :rela nil :xc nil)
(:title "Context")
- (:print-slots sab code rnk c
nx
cxl hcd rela xc cui2 cxs))
+ (:print-slots sab code rnk c
xn
cxl hcd rela xc cui2 cxs))
(defclass ustr (umlsclass)
((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
(defclass ustr (umlsclass)
((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
@@
-155,7
+155,7
@@
(:metaclass hyperobject-class)
(:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
(:title "Locator")
(:metaclass hyperobject-class)
(:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
(:title "Locator")
- (:print-slots isn fr un sna soui sui
suistr
))
+ (:print-slots isn fr un sna soui sui))
(defclass uterm (umlsclass)
((lui :type fixnum :initarg :lui :reader lui :reference find-uterm-lui)
(defclass uterm (umlsclass)
((lui :type fixnum :initarg :lui :reader lui :reference find-uterm-lui)
@@
-218,7
+218,7
@@
(:metaclass hyperobject-class)
(:default-initargs :sab nil :rel nil :atx nil)
(:title "Associated Expression")
(:metaclass hyperobject-class)
(:default-initargs :sab nil :rel nil :atx nil)
(:title "Associated Expression")
- (print-slots sab rel atx))
+ (
:
print-slots sab rel atx))
(defclass ucon (umlsclass)
((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
(defclass ucon (umlsclass)
((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
@@
-286,7
+286,7
@@
(:metaclass hyperobject-class)
(:default-initargs :eui nil :wrd nil)
(:title "Lexical Term")
(:metaclass hyperobject-class)
(:default-initargs :eui nil :wrd nil)
(:title "Lexical Term")
- (:print-
list
eui wrd))
+ (:print-
slots
eui wrd))
(defclass labr (umlsclass)
(defclass labr (umlsclass)
@@
-298,7
+298,7
@@
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
(:title "Abbreviations and Acronyms")
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
(:title "Abbreviations and Acronyms")
- (:print-slots eui bas ab
sr eui2 bas3
))
+ (:print-slots eui bas ab
r eui2 bas2
))
(defclass lagr (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
(defclass lagr (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@
-320,7
+320,7
@@
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :com nil)
(:title "Complementation")
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :com nil)
(:title "Complementation")
- (:print-slots eui bas sca c
a
m))
+ (:print-slots eui bas sca c
o
m))
(defclass lmod (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
(defclass lmod (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@
-331,7
+331,7
@@
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
(:title "Modifiers")
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
(:title "Modifiers")
- (:print-slots eui bas sca
n
psnmod fea))
+ (:print-slots eui bas sca psnmod fea))
(defclass lnom (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
(defclass lnom (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@
-343,7
+343,7
@@
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
(:title "Nominalizations")
(:metaclass hyperobject-class)
(:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
(:title "Nominalizations")
- (:print-slots eui bas eui2 bas2 sca2))
+ (:print-slots eui bas
sca
eui2 bas2 sca2))
(defclass lprn (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
(defclass lprn (umlsclass)
((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@
-437,7
+437,7
@@
(:metaclass hyperobject-class)
(:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
(:title "Structure of the Network")
(:metaclass hyperobject-class)
(:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
(:title "Structure of the Network")
- (:print-slots styrl rl styl2 ls))
+ (:print-slots styrl rl sty
r
l2 ls))
(defclass sstre1 (umlsclass)
((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui)
(defclass sstre1 (umlsclass)
((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui)
@@
-446,7
+446,7
@@
(:metaclass hyperobject-class)
(:default-initargs :ui nil :ui2 nil :ui3 nil)
(:title "Fully Inherited Set of Releatons (TUI's)")
(:metaclass hyperobject-class)
(:default-initargs :ui nil :ui2 nil :ui3 nil)
(:title "Fully Inherited Set of Releatons (TUI's)")
- (:print-slots ui ui2 ui3)
+ (:print-slots ui ui2 ui3)
)
(defclass sstre2 (umlsclass)
((sty :type string :initarg :ui :reader sty)
(defclass sstre2 (umlsclass)
((sty :type string :initarg :ui :reader sty)
@@
-459,6
+459,9
@@
;;; Formatting routines
;;; Formatting routines
+(defun fmt-comma-integer (i)
+ (format nil "~:d" i))
+
(defgeneric fmt-cui (c))
(defmethod fmt-cui ((c ucon))
(format nil "C~7,'0d" (cui c)))
(defgeneric fmt-cui (c))
(defmethod fmt-cui ((c ucon))
(format nil "C~7,'0d" (cui c)))
@@
-524,7
+527,7
@@
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun english-term-p (obj)
"Returns two values: T/NIL if term is english and T/NIL if obj is a TERM"
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun english-term-p (obj)
"Returns two values: T/NIL if term is english and T/NIL if obj is a TERM"
- (if (eq (hyperobject::
portable-class-name (hyperobject::portable-
class-of obj)) 'uterm)
+ (if (eq (hyperobject::
class-name (hyperobject::
class-of obj)) 'uterm)
(values (string-equal (lat obj) "ENG") t)
(values nil nil))))
(values (string-equal (lat obj) "ENG") t)
(values nil nil))))
@@
-535,10
+538,10
@@
(defmethod print-umlsclass ((obj umlsclass) &key (os *standard-output*) (format :text)
(label nil) (file-wrapper t) (english-only nil) (subobjects nil)
(refvars nil))
(defmethod print-umlsclass ((obj umlsclass) &key (os *standard-output*) (format :text)
(label nil) (file-wrapper t) (english-only nil) (subobjects nil)
(refvars nil))
- (
print-hyperobject
obj :os os :format format :label label :subobjects subobjects
-
:file-wrapper file-wrapper
-
:english-only-function (if english-only #'english-term-p nil)
-
:refvars refvars))
+ (
view
obj :os os :format format :label label :subobjects subobjects
+ :file-wrapper file-wrapper
+ :english-only-function (if english-only #'english-term-p nil)
+ :refvars refvars))
(defmacro define-lookup-display (newfuncname lookup-func)
(defmacro define-lookup-display (newfuncname lookup-func)