r11209: fix test

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index ee07f27bf859621daef4ee121fd6ca2ea1fb3479..49f6e2e06f551ed28ba9b99f06c82147b9148175 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -2,23 +2,21 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          composite.lisp
-;;;; Purpose:       Composite Classes for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     composite.lisp
+;;;; Purpose:  Composite Classes for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.16 2002/11/25 07:45:36 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; 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)
 
 ;;; Semantic type constants
 
@@ -50,8 +48,7 @@
        (aif (funcall cui2-func c)
             (let ((ucon2 (find-ucon-cui it)))
               (when (ucon-is-tui? ucon2 tui)
-                ucon2))
-            nil))
+                ucon2)) nil))
     (funcall related-con-func ucon))
    :key #'cui))
 
@@ -66,32 +63,33 @@
 ;;; 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)
-  (:title "Frequency class")
-  (:print-slots freq)
+  (:user-name "Frequency class" "Frequency classes")
+  (:default-print-slots freq)
   (:description "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)
+  (:user-name "Concept and Count" "Concepts and Counts")
+  (:default-print-slots cui freq pfstr)
   (:description "Composite object of ucon/freq"))
 
 (defclass ustr_freq (ustr freq)
   ()
   (:metaclass hyperobject-class)
-  (:title "String and Count")
-  (:print-slots sui freq stt lrl str)
+  (:user-name "String and Count" "Strings and Counts")
+  (:default-print-slots sui freq stt lrl str)
   (:description "Composite object of ustr/freq"))
 
 (defclass usty_freq (usty freq)
-  ((freq :type fixnum :initarg :freq :accessor freq))
+  ()
   (:metaclass hyperobject-class)
-  (:title "Semantic Type and Count")
-  (:print-slots tui freq sty)
+  (:user-name "Semantic Type and Count" "Semantic Types and Counts")
+  (:default-print-slots tui freq sty)
   (:description "Composite object of usty/freq"))
 
 (defun find-usty_freq-all ()
@@ -100,16 +98,18 @@
       (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)))
 
 
 (defclass usrl_freq (usrl freq)
   ()
   (:metaclass hyperobject-class)
-  (:title "Source and Count")
-  (:print-slots sab freq srl)
+  (:user-name "Source and Count" "Sources and Counts")
+  (:default-print-slots sab freq srl)
   (:description "Composite object of usrl/freq"))
 
 ;; Frequency finding functions
@@ -121,7 +121,9 @@
                   (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)
@@ -181,7 +183,7 @@
 (defun find-ucon2_freq-coc-tui-all (tui)
   (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
 
-#+(or cmu scl)
+#+(or scl)
 (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
   (let ((cl #+cmu (pcl:find-class c)
            #+scl (find-class c)))