Changeset 39355 in project

Timestamp:

11/23/20 22:24:04 (5 months ago)

Author:

Kon Lovett

Message:

add types include(s), simplify seq-utils list use

Location:

release/5/micro-stats/trunk

Files:

• micro-stats-types.scm (added)
• micro-stats.scm (modified) (3 diffs)
• seq-utils-types.scm (added)
• seq-utils.scm (modified) (2 diffs)

release/5/micro-stats/trunk/micro-stats.scm

@@ -28 +28 @@
 ;;;
 
-;FIXME should be in an include file from the seq-utils egg but C5 bug
-(define-type seq (or list vector string #;linear-sequence #;random-access-sequence))
-(define-type binary-predicate (* * --> boolean))
-(define-type alist (or null (list-of (pair * *))))
-(define-type histogram-list list)
-
-(define-type real (or integer float ratnum))
-
-(define-type statistics-alist (or null (list-of (pair symbol *))))
-
-(define-type statistics-set-id (or symbol boolean))
+(include "micro-stats-types")
 
 (: statistics-sets (#!optional alist -> alist))
@@ -47 +37 @@
 (: generate-statistics-sublist (seq list #!optional vector --> (pair symbol *)))
 
-(: chi-sample (seq (or real seq) --> real))
-(: chi-squares (seq seq --> seq))
-(: chi-square (seq (or real seq) --> real))
 (: variance (seq real --> real))
 (: standard-deviation (seq #!optional real --> real real))
@@ -57 +44 @@
 (: mean (seq --> real real real))
 (: percentile (seq #!optional real binary-predicate --> real))
+
+(: chi-sample (seq (or real seq) --> real))
+(: chi-squares (seq seq --> seq))
+(: chi-square (seq (or real seq) --> real))
 
 ;;;

release/5/micro-stats/trunk/seq-utils.scm

@@ -20 +20 @@
 ;;;
 
-;(define-type seq (or list vector string linear-sequence random-access-sequence))
-(define-type seq (or list vector string))
+(include "seq-utils-types")
 
-(define-type binary-predicate (* * --> boolean))
-
-(define-type alist (or null (list-of (pair * *))))
-
-(define-type histogram-list list)
-
-(: sorted? (seq binary-predicate --> boolean))
 (: merge! (seq seq binary-predicate -> seq))
 (: merge (seq seq binary-predicate -> seq))
+(: sorted? (seq binary-predicate --> boolean))
 (: sort! (seq binary-predicate -> seq))
 (: sort (seq binary-predicate -> seq))
@@ -42 +35 @@
 (define *empty-list* (list))
 
-(define (sorted? seq less?)
-  (let ((seqv (if (or (list? seq) (vector? seq)) seq (seq:coerce *empty-list* seq))))
-    (chicken:sorted? seqv less?) ) )
+(define (seq->list x) (if (list? x) x (seq:coerce *empty-list* x)))
 
 (define (merge! a b less?)
-  (let* (
-    (as (if (list? a) a (seq:coerce *empty-list* a)))
-    (bs (if (list? b) b (seq:coerce *empty-list* b)))
-    (rs (chicken:merge! as bs less?)) )
+  (let ((rs (chicken:merge! (seq->list a) (seq->list b) less?)))
     (if (list? a) rs (seq:coerce a rs)) ) )
 
 (define (merge a b less?)
-  (let* (
-    (as (if (list? a) a (seq:coerce *empty-list* a)))
-    (bs (if (list? b) b (seq:coerce *empty-list* b)))
-    (rs (chicken:merge as bs less?)) )
+  (let ((rs (chicken:merge (seq->list a) (seq->list b) less?)))
     (if (list? a) rs (seq:coerce a rs)) ) )
+
+(define (sorted? seq less?)
+  (let ((ss (if (vector? seq) seq (seq->list seq))))
+    (chicken:sorted? ss less?) ) )
 
 (define (sort! seq less?)
   ;FIXME fill-in original from sorted-list
   (let* (
-    (seqv (if (or (list? seq) (vector? seq)) seq (seq:coerce *empty-list* seq)))
-    (rs (chicken:sort! seqv less?)) )
+    (ss (if (vector? seq) seq (seq->list seq)))
+    (rs (chicken:sort! ss less?)) )
     (if (or (list? seq) (vector? seq)) rs (seq:coerce seq rs)) ) )
 
 (define (sort seq less?)
-  (seq:coerce seq (chicken:sort! (seq:coerce *empty-list* seq) less?)) )
+  (seq:coerce seq (chicken:sort! (seq->list seq) less?)) )
 
 ;;