X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=composite.lisp;h=d967c99130bdbea196b14e2cca9ea2f2ae4da2b1;hb=5265bd2d2382c51c7bbef19c150466eb1afd58bd;hp=f440ac07d7192c881f9e101e93d0bb13509ef2ec;hpb=8f58bdf5056ba1925a973a3353d329a9a1e72ad2;p=umlisp.git

diff --git a/composite.lisp b/composite.lisp
index f440ac0..d967c99 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; 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.15 2002/11/24 19:03:34 kevin Exp $
+;;;; $Id: composite.lisp,v 1.22 2003/05/14 05:37:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,8 +16,10 @@
 ;;;; 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
@@ -50,8 +52,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 +67,32 @@
 ;;; 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))
+  ((freq :value-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 +101,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,8 +124,10 @@
 		   (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)))
-    (sort freqs #'> :key #'usrl_freq-freq)))
+	(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)
 "Return sorted list of tuples with ucon and freq that have co-occuring concepts of semantic type tui"