r11474: improve verbose status msgs

[umlisp.git] / parse-rrf.lisp

diff --git a/parse-rrf.lisp b/parse-rrf.lisp
index 4e23fb7a6c4adba2dce167837b34d80a1f475209..84a4b4b168d114b1eaae3b70ec8549d2c8ac00e6 100644 (file)
--- a/parse-rrf.lisp
+++ b/parse-rrf.lisp
@@ -40,19 +40,20 @@
           (clrhash cuisui-lrl-hash)
           (clrhash sab-srl-hash))
       (setf
-         pfstr-hash (make-hash-table :size 1300000)
-         cui-lrl-hash (make-hash-table :size 1300000)
-         lui-lrl-hash (make-hash-table :size 4600000)
-         sui-lrl-hash (make-hash-table :size 5100000)
-         cuisui-lrl-hash (make-hash-table :size 2000000)
-         sab-srl-hash (make-hash-table :size 100 :test 'equal))))
+         pfstr-hash (make-hash-table :size 1500000)
+         cui-lrl-hash (make-hash-table :size 1500000)
+         lui-lrl-hash (make-hash-table :size 5000000)
+         sui-lrl-hash (make-hash-table :size 6000000)
+         cuisui-lrl-hash (make-hash-table :size 6000000)
+         sab-srl-hash (make-hash-table :size 200 :test 'equal))))
 
   (defun ensure-preparse (&optional (force-read nil))
     (when (and *preparse-hash-init?* (not force-read))
       (return-from ensure-preparse 'already-done))
     (make-preparse-hash-table)
     (let ((counter 0))
-      (declare (fixnum counter))
+      (declare (fixnum counter)
+               (ignorable counter))
       (with-umls-file (line "MRCONSO.RRF")
         (let ((cui (parse-ui (nth 0 line)))
               (lui (parse-ui (nth 3 line)))
@@ -220,7 +221,7 @@
       ("SUI" "MRCONSO") ("SAUI" "MRCONSO") ("CODE" "MRCONSO")
       ("SCUI" "MRCONSO")
       ("CUI" "MRDEF")
-      ("CUI1" "MRREL") ("CUI2" "MRREL")
+      ("CUI1" "MRREL") ("CUI2" "MRREL") ("SAB" "MRREL")
       ("RUI" "MRREL") ("AUI1" "MRREL") ("AUI2" "MRREL")
       ("CUI" "MRSAT") ("LUI" "MRSAT") ("SUI" "MRSAT")
       ("METAUI" "MRSAT") ("ATN" "MRSAT")
@@ -308,7 +309,7 @@
 
 
 (defun gen-ufiles-generic (files-filename dir)
-"Initialize all LEX file structures"
+"Initialize generic UMLS file structures"
   (let ((files '()))
     (with-umls-file (line files-filename)
       (destructuring-bind (fil des fmt cls rws bts) line