projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3464: *** empty log message ***
[umlisp.git]
/
composite.lisp
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
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: composite.lisp,v 1.1
0 2002/11/23 20:59:22
kevin Exp $
+;;;; $Id: composite.lisp,v 1.1
1 2002/11/23 22:15:13
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; 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)
(: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)
(: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")
(: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 ()
(: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)
(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)))
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))
(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))
(let ((ucon_freq-list '()))
(dotimes (i (find-cui-max))
(declare (fixnum i))