X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=genutils.lisp;h=cbd78f1682ea0d3a498883b55cd3c547fdc577a3;hb=aa610805927518a648eb0da6a8713cd0a83337df;hp=fafc9024f028b14641619481bd15b0fbcd0838e1;hpb=bd67bea99b0f8645241a79b2cbbba80d707bd6ab;p=kmrcl.git

diff --git a/genutils.lisp b/genutils.lisp
index fafc902..cbd78f1 100644
--- a/genutils.lisp
+++ b/genutils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: genutils.lisp,v 1.11 2002/12/04 16:49:23 kevin Exp $
+;;;; $Id: genutils.lisp,v 1.16 2003/04/28 21:12:27 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,7 +18,6 @@
 
 
 (in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
 
 (defmacro let-when ((var test-form) &body body)
   `(let ((,var ,test-form))
@@ -156,6 +155,12 @@
         (if val (push val acc))))
     (nreverse acc)))
 
+(defun appendnew (l1 l2)
+  "Append two lists, filtering out elem from second list that are already in first list"
+  (dolist (elem l2)
+    (unless (find elem l1)
+      (setq l1 (append l1 (list elem)))))
+  l1)
 
 ;; Functions
 
@@ -325,15 +330,6 @@
     (terpri ostrm)))
 
 
-;;; Symbol functions
-
-(defmacro concat-symbol (&rest args)
-  `(intern (concatenate 'string ,@args)))
-
-(defmacro concat-symbol-pkg (pkg &rest args)
-  `(intern (concatenate 'string ,@args) ,pkg))
-
-
 ;;; IO
 
 
@@ -484,32 +480,50 @@
       (nreverse lines))))
 
 
-;;; Formatting functions
-
-(defun pretty-date (year month day &optional (hour 12) (m 0) (s 0))
-  (multiple-value-bind (sec min hr dy mn yr wkday)
-    (decode-universal-time
-     (encode-universal-time s m hour day month year))
-    (values (elt '("Monday" "Tuesday" "Wednesday" "Thursday"
-		   "Friday" "Saturday" "Sunday")
-		 wkday)
-	    (elt '("January" "February" "March" "April" "May" "June"
-		   "July" "August" "September" "October" "November"
-		   "December")
-		 (1- mn))
-	    (format nil "~A" dy) (format nil "~A" yr)
-	    (format nil "~2,'0D:~2,'0D:~2,'0D" hr min sec))))
-
-
-(defun date-string (ut)
-  (if (typep ut 'integer)
-      (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
-	  (decode-universal-time ut)
-	(declare (ignore daylight-p zone))
-	(format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" 
-		dow
-		day
-		(1- mon)
-		year
-		hr min sec))))
 
+;; Benchmarking
+
+(defun print-float-units (val unit)
+  (cond
+    ((< val 1d-6)
+     (format t "~,2,9F nano~A" val unit))
+    ((< val 1d-3)
+     (format t "~,2,6F micro~A" val unit))
+    ((< val 1)
+     (format t "~,2,3F milli~A" val unit))
+    ((> val 1d9)
+     (format t "~,2,-9F giga~A" val unit))
+    ((> val 1d6)
+     (format t "~,2,-6F mega~A" val unit))
+    ((> val 1d3)
+     (format t "~,2,-3F kilo~A" val unit))
+    (t
+     (format t "~,2F ~A" val unit))))
+
+(defun print-seconds (secs)
+  (print-float-units secs "sec"))
+
+(defmacro time-iterations (n &body body)
+  (let ((i (gensym))
+	(count (gensym)))
+    `(progn
+       (let ((,count ,n))
+	 (format t "~&Test with ~d iterations: ~W" ,count (quote ,body))
+	 (let ((t1 (get-internal-real-time)))
+	   (dotimes (,i ,count)
+	     ,@body)
+	   (let* ((t2 (get-internal-real-time))
+		  (secs (coerce (/ (- t2 t1)
+				   internal-time-units-per-second)
+				'double-float)))
+	     (format t "~&Total time: ")
+	     (print-seconds secs)
+	     (format t ", time per iteration: ")
+	     (print-seconds (coerce (/ secs ,n) 'double-float))))))))
+
+
+(defun nsubseq (sequence start &optional (end (length sequence)))
+  (make-array (- end start)
+	      :element-type (array-element-type sequence)
+	      :displaced-to sequence
+	      :displaced-index-offset start))