changeset 54:861a01f7d25f

Simplify
author Chris Cannam
date Tue, 08 Jan 2013 16:31:07 +0000
parents d037211bf5d7
children d0c7fdfc78c1
files vamp.yeti
diffstat 1 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/vamp.yeti	Tue Jan 08 16:21:08 2013 +0000
+++ b/vamp.yeti	Tue Jan 08 16:31:07 2013 +0000
@@ -84,23 +84,15 @@
     process floats time is ~float[][] -> ~RealTime -> 'a = p#process(floats, 0, time),
     dispose () = p#dispose(),
     };
-/*
-realTime r is ~RealTime -> 'a = {
-    get sec () = r#sec(),
-    get nsec () = r#nsec(),
-    get toString () = r#toString(),
-    };
-*/
 
 realTime r is ~RealTime -> number = r#sec() + (r#nsec() / 1000000000);
 
-//!!!
-foldHash f h l is ('a -> hash<'b, 'c>) -> hash<'b, 'c> -> list?<'a> -> hash<'b, 'c> =
-   ( for l do x: insertHash h (f x) done; h; );
-
-//!!!
-hashFromKeys f kk is ('a -> 'b) -> list?<'a> -> hash<'a, 'b> =
-    foldHash do k: [ k: f k ] done [:] kk;
+hashFromKeys f kk = 
+   (r = [:];
+    for kk do k:
+        r[k] := f k;
+    done;
+    r);
 
 numberOf n is ~Object -> number = (n unsafely_as ~Integer)#intValue();