r8005: Automated commit for kmrcl debian-version-1.58-1

[kmrcl.git] / math.lisp

diff --git a/math.lisp b/math.lisp
index 9772b7a52df849bfee3b40b4eebb4f5a6162c541..0197d52d5652a9fcdf28f117a309766fc7f9dc12 100644 (file)
--- a/math.lisp
+++ b/math.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Nov 2002
 ;;;;
-;;;; $Id: math.lisp,v 1.1 2002/11/08 06:43:34 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,8 +17,7 @@
 ;;;; *************************************************************************
 
 
-(in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:kmrcl)
 
 (defun deriv (f dx)
   #'(lambda (x)
@@ -29,3 +28,45 @@
     (funcall (deriv #'sin 1d-8) x))
 
 ;;; (sin^ pi)
+
+(defmacro ensure-integer (obj)
+  "Ensure object is an integer. If it is a string, then parse it"
+  `(if (stringp ,obj)
+      (parse-integer ,obj)
+     ,obj))
+
+(defun histogram (v n-bins &key min max)
+  (declare (fixnum n-bins))
+  (when (listp v)
+    (setq v (coerce v 'vector)))
+  (when (zerop (length v))
+    (return-from histogram (values nil nil nil)) )
+  (let ((n (length v))
+       (bins (make-array n-bins :element-type 'integer :initial-element 0))
+       found-min found-max)
+    (declare (fixnum n))
+    (unless (and min max)
+      (setq found-min (aref v 0)
+           found-max (aref v 0))
+      (loop for i fixnum from 1 to (1- n)
+         do
+           (let ((x (aref v i)))
+             (cond
+              ((> x found-max)
+               (setq found-max x))
+              ((< x found-min)
+               (setq found-min x)))))
+      (unless min
+       (setq min found-min))
+      (unless max
+       (setq max found-max)))
+    (let ((width (/ (- max min) n-bins)))
+      (setq width (+ width (* double-float-epsilon width)))
+      (dotimes (i n)
+       (let ((bin (nth-value 0 (truncate (- (aref v i) min) width))))
+         (declare (fixnum bin))
+         (when (and (not (minusp bin))
+                    (< bin n-bins))
+           (incf (aref bins bin))))))
+    (values bins min max)))
+