r3464: *** empty log message ***

diff --git a/classes.lisp b/classes.lisp
index e1cf6ccf863becf926689486fff7aebf178b36d3..dbb4bc1b8c91e7edc7131bff5b8f13560b99f7c4 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.13 2002/11/23 18:41:41 kevin Exp $
+;;;; $Id: classes.lisp,v 1.14 2002/11/23 22:15:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -218,7 +218,7 @@
   (: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
@@ -286,7 +286,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :wrd nil)
   (:title "Lexical Term")
-  (:print-list eui wrd))
+  (:print-slots eui wrd))
 
 
 (defclass labr  (umlsclass)
@@ -446,7 +446,7 @@
   (: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)

diff --git a/composite.lisp b/composite.lisp
index 143b130b4c9f217c3931a3fedebfd4661f14099c..ddda98f6cd9aeda7179ed11c0e77e27794b4b74c 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.10 2002/11/23 20:59:22 kevin Exp $
+;;;; $Id: composite.lisp,v 1.11 2002/11/23 22:15:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -71,7 +71,6 @@
   (:default-initargs :freq 0)
   (:title "Concept and Count")
   (:print-slots cui freq pfstr)
-  (:ref-fields (cui find-ucon-cui))
   (:documentation "Composite object of ucon/freq"))
 
 (defclass ustr_freq (ustr)
@@ -87,7 +86,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:title "Semantic Type and Count")
-  (:print-slots tui freq sty))
+  (:print-slots tui freq sty)
   (:documentation "Composite object of usty/freq"))
 
 (defun find-usty_freq-all ()
@@ -128,7 +127,8 @@
       (kmrcl:aif (cui2 ucoc) 
            (let ((ucon2 (find-ucon-cui kmrcl::it))) 
              (when (ucon-is-tui? ucon2 tui)
-              (push (make-instance 'ucon_freq :ucon ucon2 :freq (cof ucoc)) 
+              (push (make-instance 'ucon_freq :cui (cui ucon2) :lrl (lrl ucon2)
+                                   :pfstr (pfstr ucon2) :freq (cof ucoc)) 
                     ucon_freqs)))))
     (setq ucon_freqs (delete-duplicates ucon_freqs :key #'cui))
     (sort ucon_freqs #'> :key #'freq)))
@@ -161,7 +161,8 @@
        (kmrcl:aif (aref ucon_freqs (cui ucon2))
             (setf (freq kmrcl::it) (1+ (freq kmrcl::it)))
             (setf (aref ucon_freqs (cui ucon2)) 
-              (make-instance 'ucon_freq :ucon ucon2 :freq 1)))))
+              (make-instance 'ucon_freq :cui (cui ucon2) :lrl (lrl ucon2)
+                             :pfstr (pfstr ucon2) :freq 1)))))
     (let ((ucon_freq-list '()))
       (dotimes (i (find-cui-max))
        (declare (fixnum i))

diff --git a/debian/control b/debian/control
index 0ee0fc100f237e9648a739fefde89f2201b4714a..dbb31d54a675015aa8a4774e473c500e5fcd8735 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/devel
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.5.7.1
+Standards-Version: 3.5.8.0
 
 Package: cl-umlisp
 Architecture: all