Import Upstream version 3a1upstream/3a1

1 files changed, 13 insertions, 14 deletions

diff --git a/plottest.scm b/plottest.scm
index a601a49..0a1f1f6 100644
--- a/plottest.scm
+++ b/plottest.scm
@@ -8,7 +8,7 @@
 ;1.  Any copy made of this software must include this copyright notice
 ;in full.
 ;
-;2.  I have made no warrantee or representation that the operation of
+;2.  I have made no warranty or representation that the operation of
 ;this software will be error-free, and I am under no obligation to
 ;provide any services, by way of maintenance, update, or otherwise.
 ;
@@ -19,6 +19,7 @@
 
 (require 'charplot)
 (require 'random)
+(require 'random-inexact)
 
 (define strophoid
   (let ((l '()))
@@ -30,18 +31,16 @@
 	      (set! l (cons (cons x y) l))
 	      (set! l (cons (cons x (- y)) l))))))
     l))
+(plot strophoid "x" "y") (newline)
 
-(plot! strophoid "x" "y") (newline)
+(histograph (do ((idx 99 (+ -1 idx))
+		 (lst '() (cons (* .02 (random:normal)) lst)))
+		((negative? idx) lst))
+	    "normal")
+(newline)
 
-(define unif
-  (let* ((l 6)
-	 (v (make-vector l)))
-    (do ((i (- l 1) (- i 1)))
-	((negative? i))
-      (vector-set! v i (cons i 0)))
-    (do ((i 24 (- i 1))
-	 (r (random l) (random l)))
-	((zero? i) (vector->list v))
-      (set-cdr! (vector-ref v r) (+ 1 (cdr (vector-ref v r)))))))
-
-(plot! unif "n" "occur")
+(histograph (do ((idx 99 (+ -1 idx))
+		 (lst '() (cons (random 5) lst)))
+		((negative? idx) lst))
+	    "random")
+(newline)