changeset 205:58b1df1c30fd

This revision exhibits the "module type not fully defined" error, trying to track down the cause
author Chris Cannam
date Tue, 07 May 2013 12:06:41 +0100
parents 045908c861a4
children f2fdc9f13a5f
files yetilab/stream/filter.yeti yetilab/stream/test/test_filter.yeti
diffstat 2 files changed, 2 insertions(+), 165 deletions(-) [+]
line wrap: on
line diff
--- a/yetilab/stream/filter.yeti	Fri May 03 18:17:00 2013 +0100
+++ b/yetilab/stream/filter.yeti	Tue May 07 12:06:41 2013 +0100
@@ -92,10 +92,8 @@
 
 {
     truncatedTo, 
-    delayedBy,
-    multiplexed,
-//!!!} as {
-//    truncatedTo is number -> stream -> stream
+} as {
+    truncatedTo is number -> stream -> stream,
 }
 
 
--- a/yetilab/stream/test/test_filter.yeti	Fri May 03 18:17:00 2013 +0100
+++ b/yetilab/stream/test/test_filter.yeti	Tue May 07 12:06:41 2013 +0100
@@ -25,167 +25,6 @@
         ( str.close (); true )
 ),
 
-"delayedBy-0-3": \(
-    str = filt.delayedBy 0 (filt.truncatedTo 3 (syn.generated 2 id));
-    compare str.position 0 and
-        compare str.channels 1 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 3) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 4).getRow 0)) [ 0,1,2 ] and
-        compare str.position 3 and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        ( str.close (); true )
-),
-
-"delayedBy-0-inf": \(
-    str = filt.delayedBy 0 (syn.generated 2 id);
-    compare str.position 0 and
-        compare str.channels 1 and
-        compare str.sampleRate 2 and
-        compare str.available (Infinite ()) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 4).getRow 0)) [ 0,1,2,3 ] and
-        compare str.position 4 and
-        compare str.available (Infinite ()) and
-        compare str.finished? false and
-        ( str.close (); true )
-),
-
-"delayedBy-2-3": \(
-    str = filt.delayedBy 2 (filt.truncatedTo 3 (syn.generated 2 id));
-    compare str.position 0 and
-        compare str.channels 1 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 5) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 4).getRow 0)) [ 0,0,0,1 ] and
-        compare str.position 4 and
-        compare str.available (Known 1) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 4).getRow 0)) [ 2 ] and
-        compare str.position 5 and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        ( str.close (); true )
-),
-
-"delayedBy-2-3b": \(
-    str = filt.delayedBy 2 (filt.truncatedTo 3 (syn.generated 2 id));
-    compare str.position 0 and
-        compare str.channels 1 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 5) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 1).getRow 0)) [ 0 ] and
-        compare str.position 1 and
-        compare str.available (Known 4) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 4).getRow 0)) [ 0,0,1,2 ] and
-        compare str.position 5 and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        ( str.close (); true )
-),
-
-"delayedBy-2-inf": \(
-    str = filt.delayedBy 2 (syn.generated 2 id);
-    compare str.position 0 and
-        compare str.channels 1 and
-        compare str.sampleRate 2 and
-        compare str.available (Infinite ()) and
-        compare str.finished? false and
-        compare (bl.list ((str.read 2).getRow 0)) [ 0,0 ] and
-        compare str.position 2 and
-        compare str.finished? false and
-        compare (bl.list ((str.read 2).getRow 0)) [ 0,1 ] and
-        compare str.position 4 and
-        compare str.finished? false and
-        compare (bl.list ((str.read 2).getRow 0)) [ 2,3 ] and
-        compare str.position 6 and
-        compare str.finished? false and
-        ( str.close (); true )
-),
-
-"multiplexed-inf-inf": \(
-    str = filt.multiplexed [syn.generated 2 id, syn.generated 2 (0-)];
-    compare str.position 0 and
-        compare str.channels 2 and
-        compare str.sampleRate 2 and
-        compare str.available (Infinite ()) and
-        compare str.finished? false and
-        compare (map bl.list (mat.asRows (str.read 4)))
-            [[0,1,2,3], [0,-1,-2,-3]] and
-        compare str.available (Infinite ()) and
-        compare str.position 4 and
-        ( str.close (); true )
-),
-
-"multiplexed-inf-trunc": \(
-    str = filt.multiplexed [syn.generated 2 id, filt.truncatedTo 3 (syn.generated 2 (0-))];
-    compare str.position 0 and
-        compare str.channels 2 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 3) and
-        compare str.finished? false and
-        compare (map bl.list (mat.asRows (str.read 4))) [[0,1,2], [0,-1,-2]] and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        compare str.position 3 and
-        ( str.close (); true )
-),
-
-"multiplexed-precalc-trunc": \(
-    str = filt.multiplexed
-       [syn.precalculated 2 (bl.fromList [1,2]),
-        filt.truncatedTo 3 (syn.generated 2 (0-))];
-    compare str.position 0 and
-        compare str.channels 2 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 2) and
-        compare str.finished? false and
-        compare (map bl.list (mat.asRows (str.read 4))) [[1,2], [0,-1]] and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        compare str.position 2 and
-        ( str.close (); true )
-),
-
-"multiplexed-2-1": \(
-    str = filt.multiplexed
-       [syn.precalculated 2 (bl.fromList [1,2]),
-        filt.multiplexed [syn.precalculated 2 (bl.fromList [3,4]),
-                          filt.truncatedTo 3 (syn.generated 2 (0-))]];
-    compare str.position 0 and
-        compare str.channels 3 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 2) and
-        compare str.finished? false and
-        compare (map bl.list (mat.asRows (str.read 4))) [[1,2], [3,4], [0,-1]] and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        compare str.position 2 and
-        ( str.close (); true )
-),
-
-"multiplexed-2-1b": \(
-    str = filt.multiplexed
-       [syn.precalculated 2 (bl.fromList [1,2]),
-        syn.precalculated 2 (bl.fromList [3,4]),
-        filt.truncatedTo 3 (syn.generated 2 (0-))];
-    compare str.position 0 and
-        compare str.channels 3 and
-        compare str.sampleRate 2 and
-        compare str.available (Known 2) and
-        compare str.finished? false and
-        compare (map bl.list (mat.asRows (str.read 4))) [[1,2], [3,4], [0,-1]] and
-        compare str.available (Known 0) and
-        compare str.finished? true and
-        compare str.position 2 and
-        ( str.close (); true )
-),
-
 //!!! still no tests for filters with multi-channel inputs
 
 ] is hash<string, () -> boolean>