r3613: *** empty log message ***

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index e5ffc20f7ce1f90e99368e106fd5f9198597f550..0489853ff1fc11461c39d033620e6cc5ecc04bb8 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.14 2002/11/24 06:02:49 kevin Exp $
+;;;; $Id: composite.lisp,v 1.18 2002/12/13 05:43:38 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -50,8 +50,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))
 
@@ -69,30 +68,30 @@
   ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
-  (:title "Frequency class")
-  (:print-slots freq)
-  (:documentation "Base class containing frequency slot, used for multi-inherited objects"))
+  (:user-name "Frequency class")
+  (: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)
-  (:documentation "Composite object of ucon/freq"))
+  (:user-name "Concept and Count")
+  (: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)
-  (:documentation "Composite object of ustr/freq"))
+  (:user-name "String and Count")
+  (: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)
-  (:documentation "Composite object of usty/freq"))
+  (:user-name "Semantic Type and Count")
+  (:default-print-slots tui freq sty)
+  (:description "Composite object of usty/freq"))
 
 (defun find-usty_freq-all ()
   (let ((usty_freqs '()))
@@ -108,9 +107,9 @@
 (defclass usrl_freq (usrl freq)
   ()
   (:metaclass hyperobject-class)
-  (:title "Source and Count")
-  (:print-slots sab freq srl)
-  (:documentation "Composite object of usrl/freq"))
+  (:user-name "Source and Count")
+  (:default-print-slots sab freq srl)
+  (:description "Composite object of usrl/freq"))
 
 ;; Frequency finding functions
 
@@ -122,7 +121,7 @@
                          (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)))
+    (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"