X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=class-support.lisp;h=3847eb5ef2813d876b4e41be5b76692a7ac20f4f;hb=011a13e252a94773802021a264400f696d3b3598;hp=92b39aab617f3a7549c0ed5f587cc1eff0078377;hpb=756b9f208a0f807c326b0ecc6d29bfc73967440e;p=umlisp.git

diff --git a/class-support.lisp b/class-support.lisp
index 92b39aa..3847eb5 100644
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -198,11 +198,6 @@
   "Returns T if UCON has a semantic type of TUI."
   (some #'(lambda (usty) (= tui (tui usty))) (s#sty ucon)))
 
-(defgeneric suistr (lo))
-(defmethod suistr ((lo ulo))
-  "Return the string for a ulo object"
-  (find-string-sui (sui lo)))
-
 (defgeneric pf-ustr (obj))
 (defmethod pf-ustr ((ucon ucon))
   "Return the preferred ustr for a ucon"
@@ -336,28 +331,6 @@
 	  "Other"))))
 
 
-(defun ucon-parents (con &key sab include-rb)
-  (ucon-ancestors con :sab sab :include-rb include-rb 
-                  :single-level t))
-
-(defun ucon-ancestors (ucon &key sab single-level include-rb)
-  "Returns a list of ancestor lists for a concept"
-  (let* ((parent-rels (append (filter-urels-by-rel (s#rel ucon) "par")
-                              (when include-rb 
-                                (filter-urels-by-rel (s#rel ucon) "rb"))))
-	 (anc nil))
-    (when sab
-      (setq parent-rels (delete-if-not
-			 (lambda (rel) (string-equal sab (sab rel)))
-			 parent-rels)))
-    (dolist (rel parent-rels (nreverse anc))
-      (let ((parent (find-ucon-cui (cui2 rel))))
-	(push
-	 (if single-level
-	     (list parent)
-	   (list* parent (car (ucon-ancestors parent (sab rel) nil))))
-	 anc)))))
-
 (defgeneric cxt-ancestors (obj))
 (defmethod cxt-ancestors ((con ucon))
   (loop for term in (s#term con)
@@ -391,13 +364,12 @@
     (loop for key being the hash-key in sab-codes
         collect (list key (gethash key sab-codes)))))
 
-
 (defun ucon-has-sab (ucon sab)
   (and (find-if (lambda (uso) (string-equal sab (sab uso))) (s#so ucon)) t))
 
-    
+
 #+scl
-(dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))
+(dolist (c '(urank udef usat uso ucxt ustr uterm usty urel ucoc uatx uconso uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))
     (let ((cl (find-class c)))
       (clos:finalize-inheritance cl)))