;;;;
;;;; Name: composite.lisp
;;;; Purpose: Composite Classes for UMLisp
-;;;; Programmer: Kevin M. Rosenberg
+;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: composite.lisp,v 1.18 2002/12/13 05:43:38 kevin Exp $
+;;;; $Id: composite.lisp,v 1.21 2003/05/06 02:14:59 kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;; as governed by the terms of the GNU General Public License.
;;;; *************************************************************************
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+
+(eval-when (:compile-toplevel)
+ (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
;;; Semantic type constants
;;; Composite Objects
(defclass freq (hyperobject)
- ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
+ ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
(:metaclass hyperobject-class)
(:default-initargs :freq 0)
(:user-name "Frequency class")
(:description "Composite object of ustr/freq"))
(defclass usty_freq (usty freq)
- ((freq :type fixnum :initarg :freq :accessor freq))
+ ((freq :value-type fixnum :initarg :freq :accessor freq))
(:metaclass hyperobject-class)
(:user-name "Semantic Type and Count")
(:default-print-slots tui freq sty)
(let* ((tui (car tuple))
(freq (ensure-integer
(caar (mutex-sql-query
- (format nil "select count(*) from MRSTY where TUI=~a" tui))))))
- (push (make-instance 'usty_freq :usty (find-usty-tui tui) :freq freq) usty_freqs)))
+ (format nil "select count(*) from MRSTY where TUI=~a" tui)))))
+ (usty (find-usty-tui tui)))
+ (push (make-instance 'usty_freq :sty (sty usty)
+ :tui (tui usty) :freq freq) usty_freqs)))
(sort usty_freqs #'> :key #'freq)))
(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)))
+ (push (make-instance 'usrl_freq :sab (sab usrl) :srl (srl usrl)
+ :freq freq)
+ freqs)))
(sort freqs #'> :key #'freq)))
(defun find-ucon2_freq-coc-tui (ucon tui)