reformat, etc

svn: r9288

collects/scheme/math.ss

@@ -3,48 +3,32 @@
 ;; math.ss: some extra math routines
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(module math scheme/base
+#lang scheme/base
-  (provide euler
+(provide euler
-           pi 
+         pi
-           sqr
+         sqr
-           sgn conjugate
+         sgn conjugate
-           sinh cosh)
+         sinh cosh)
 
-  (define (sqr z) (* z z))
+(define (sqr z) (* z z))
 
-  ;; circular constants and aliases
+;; circular constants and aliases
-  (define euler (exp 1.0)) 
+(define euler (exp 1.0))
-  (define pi (atan 0 -1))
+(define pi (atan 0 -1))
 
-  ;; sgn function 
+;; sgn function
-  (define sgn
+(define (sgn x)
-    (lambda (x)
+  (if (exact? x)
-      (if (exact? x)
+    (cond [(< x 0) -1] [(> x 0) 1] [else 0])
-	  (cond
+    (cond [(< x 0.0) -1.0] [(> x 0.0) 1.0] [else 0.0])))
-	   ((< x 0) -1)
-	   ((> x 0)  1)
-	   (else 0))
-	  (cond
-	   ((< x 0.0) -1.0)
-	   ((> x 0.0)  1.0)
-	   (else 0.0)))))
 
-  ;; complex conjugate
+;; complex conjugate
-  (define conjugate
+(define (conjugate z)
-    (lambda (z)
+  (make-rectangular (real-part z) (- (imag-part z))))
-      (make-rectangular 
-       (real-part z)
-       (- (imag-part z)))))
 
-  ;; real hyperbolic functions
+;; real hyperbolic functions
-  (define sinh 
+(define (sinh x)
-    (lambda (x)
+  (/ (- (exp x) (exp (- x))) 2.0))
-      (/
-       (- (exp x) (exp (- x)))
-       2.0)))
 
-  (define cosh
+(define (cosh x)
-    (lambda (x)
+  (/ (+ (exp x) (exp (- x))) 2.0))
-      (/
-       (+ (exp x) (exp (- x)))
-       2.0))))