# HG changeset patch
# User Chris Cannam
# Date 1363774194 0
# Node ID d0abc9afe608f621016e3474eb0a2eb027f29ec4
# Parent  77d3292bbf12a334e1ad4cd2d93052a3af0373ea
Rename modules

diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/block.yeti
--- a/yetilab/block/block.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/block.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,7 +1,7 @@
 
-module block;
+module yetilab.block.block;
 
-vec = load fvector;
+vec = load yetilab.block.fvector;
 
 typedef opaque block = ~double[];
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/blockfuncs.yeti
--- a/yetilab/block/blockfuncs.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/blockfuncs.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,7 +1,7 @@
 
-module blockfuncs;
+module yetilab.block.blockfuncs;
 
-b = load block;
+b = load yetilab.block.block;
 
 sum' =
     sum . b.list;
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/complex.yeti
--- a/yetilab/block/complex.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/complex.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,5 +1,5 @@
 
-module complex;
+module yetilab.block.complex;
 
 import java.lang: ClassCastException;
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/fmatrix.yeti
--- a/yetilab/block/fmatrix.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/fmatrix.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,8 +1,8 @@
-module fmatrix;
+module yetilab.block.fmatrix;
 
 // Basic matrices using primitive array of double as each row
 
-vec = load fvector;
+vec = load yetilab.block.fvector;
 
 zeroMatrix rows cols = array (map \(vec.zeros cols) [1..rows]);
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/fvector.yeti
--- a/yetilab/block/fvector.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/fvector.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,4 +1,4 @@
-module fvector;
+module yetilab.block.fvector;
 
 import java.util: Arrays;
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/matrix.yeti
--- a/yetilab/block/matrix.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/matrix.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,4 +1,4 @@
-module matrix;
+module yetilab.block.matrix;
 
 // Basic matrices using number type (rather than primitive arrays)
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/test/test_blockfuncs.yeti
--- a/yetilab/block/test/test_blockfuncs.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/test/test_blockfuncs.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,11 +1,11 @@
 
-module test.test_blockfuncs;
+module yetilab.block.test.test_blockfuncs;
 
 stdSqrt = sqrt;
 
-{ zeros, consts, ones, fromList, list } = load block;
-{ sum, mean, multiply, divideBy, sqr, sqrt, rms, fftshift, ifftshift } = load blockfuncs;
-{ compare } = load test.test;
+{ zeros, consts, ones, fromList, list } = load yetilab.block.block;
+{ sum, mean, multiply, divideBy, sqr, sqrt, rms, fftshift, ifftshift } = load yetilab.block.blockfuncs;
+{ compare } = load yetilab.test.test;
 
 [
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/test/test_complex.yeti
--- a/yetilab/block/test/test_complex.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/test/test_complex.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,9 +1,9 @@
-module test.test_complex;
+module yetilab.block.test.test_complex;
 
 { real, imaginary, complex, magnitude, angle, add, scale }
-   = load complex;
+   = load yetilab.block.complex;
 
-{ compare } = load test.test;
+{ compare } = load yetilab.test.test;
 
 [
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/block/test/test_fvector.yeti
--- a/yetilab/block/test/test_fvector.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/block/test/test_fvector.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,9 +1,9 @@
 
-module test.test_fvector;
+module yetilab.block.test.test_fvector;
 
-vec = load fvector;
+vec = load yetilab.block.fvector;
 
-{ compare } = load test.test;
+{ compare } = load yetilab.test.test;
 
 [
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/audiofile.yeti
--- a/yetilab/stream/audiofile.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/audiofile.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,5 +1,5 @@
 
-module audiofile;
+module yetilab.stream.audiofile;
 
 import javax.sound.sampled:
      AudioSystem, AudioInputStream, AudioFormat, AudioFormat$Encoding,
@@ -9,9 +9,9 @@
 
 import java.nio: ByteBuffer, ByteOrder;
 
-str = load stream;
-ch = load channels;
-block = load block;
+str = load yetilab.stream.stream;
+ch = load yetilab.stream.channels;
+block = load yetilab.block.block;
 
 decode8u bytes doubles n is ~byte[] -> ~double[] -> number -> () =
    (for [0..n-1] do i:
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/channels.yeti
--- a/yetilab/stream/channels.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/channels.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,9 +1,9 @@
 
-module channels;
+module yetilab.stream.channels;
 
-vec = load fvector;
-block = load block;
-mat = load fmatrix;
+vec = load yetilab.block.fvector;
+block = load yetilab.block.block;
+mat = load yetilab.block.fmatrix;
         
 interleaved m = 
    ({ cols, rows } = mat.dimensions m;
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/framer.yeti
--- a/yetilab/stream/framer.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/framer.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,16 +1,16 @@
 
-module framer;
+module yetilab.stream.framer;
 
 /**
  * Framer expresses a stream (or a file) as a lazy list of (possibly
  * overlapping) frames of mono data.
  */
 
-block = load block;
-bf = load blockfuncs;
-af = load audiofile;
-win = load window;
-fft = load fft;
+block = load yetilab.block.block;
+bf = load yetilab.block.blockfuncs;
+af = load yetilab.stream.audiofile;
+win = load yetilab.transform.window;
+fft = load yetilab.transform.fft;
 
 blockList framesize stream =
     if stream.finished? then
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/playback.yeti
--- a/yetilab/stream/playback.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/playback.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,10 +1,10 @@
 
-module playback;
+module yetilab.stream.playback;
 
-block = load block;
-fr = load framer;
-af = load audiofile;
-ch = load channels;
+block = load yetilab.block.block;
+fr = load yetilab.stream.framer;
+af = load yetilab.stream.audiofile;
+ch = load yetilab.stream.channels;
 
 import javax.sound.sampled:
     AudioSystem, AudioFormat, AudioFormat$Encoding, SourceDataLine;
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/stream.yeti
--- a/yetilab/stream/stream.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/stream.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,5 +1,5 @@
 
-module stream;
+module yetilab.stream.stream;
 
 monoStream box =
    (readAll' box = box.read (box.len - box.position);
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/syntheticstream.yeti
--- a/yetilab/stream/syntheticstream.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/syntheticstream.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,9 +1,9 @@
 
-module syntheticstream;
+module yetilab.stream.syntheticstream;
 
-str = load stream;
-vec = load fvector;
-block = load block;
+str = load yetilab.stream.stream;
+vec = load yetilab.block.fvector;
+block = load yetilab.block.block;
 
 generated rate generator seconds =
     str.monoStream {
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/stream/test/test_framer.yeti
--- a/yetilab/stream/test/test_framer.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/stream/test/test_framer.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,10 +1,10 @@
 
-module test.test_framer;
+module yetilab.stream.test.test_framer;
 
-fr = load framer;
-block = load block;
+fr = load yetilab.stream.framer;
+block = load yetilab.block.block;
 
-{ compare, testStream } = load test.test;
+{ compare, testStream } = load yetilab.test.test;
 
 [
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/test/all.yeti
--- a/yetilab/test/all.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/test/all.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,15 +1,15 @@
 
-program test.all;
+program yetilab.test.all;
 
-{ runTests } = load test.test;
+{ runTests } = load yetilab.test.test;
 
 tests = [
-"fvector"    : load test.test_fvector,
-"framer"     : load test.test_framer,
-"blockfuncs" : load test.test_blockfuncs,
-"complex"    : load test.test_complex,
-"fft"        : load test.test_fft,
-"vamppost"   : load test.test_vamppost,
+"fvector"    : load yetilab.block.test.test_fvector,
+"blockfuncs" : load yetilab.block.test.test_blockfuncs,
+"complex"    : load yetilab.block.test.test_complex,
+"framer"     : load yetilab.stream.test.test_framer,
+"fft"        : load yetilab.transform.test.test_fft,
+"vamppost"   : load yetilab.vamp.test.test_vamppost,
 ];
 
 bad = sum (mapHash do name testHash: runTests name testHash done tests);
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/test/test.yeti
--- a/yetilab/test/test.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/test/test.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,8 +1,7 @@
+module yetilab.test.test;
 
-module test.test;
-
-vec = load fvector;
-ss = load syntheticstream;
+vec = load yetilab.block.fvector;
+ss = load yetilab.stream.syntheticstream;
 
 testStream n is number -> 'a  = ss.precalculated 1000 (vec.vector [1..n]);
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/transform/fft.yeti
--- a/yetilab/transform/fft.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/transform/fft.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,11 +1,11 @@
 
-module fft;
+module yetilab.transform.fft;
 
 import edu.emory.mathcs.jtransforms.fft: DoubleFFT_1D;
 
-b = load block;
-vec = load fvector;
-complex = load complex;
+b = load yetilab.block.block;
+vec = load yetilab.block.fvector;
+complex = load yetilab.block.complex;
 
 packedToComplex p =
    (n = (vec.length p) / 2;
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/transform/test/test_fft.yeti
--- a/yetilab/transform/test/test_fft.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/transform/test/test_fft.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,11 +1,11 @@
 
-module test.test_fft;
+module yetilab.transform.test.test_fft;
 
-{ realForward, realInverse } = load fft;
-{ list, fromList } = load block;
-{ complex } = load complex;
+{ realForward, realInverse } = load yetilab.transform.fft;
+{ list, fromList } = load yetilab.block.block;
+{ complex } = load yetilab.block.complex;
 
-{ compare } = load test.test;
+{ compare } = load yetilab.test.test;
 
 testFFT orig reals imags =
    (out = realForward (length orig) (fromList orig);
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/transform/window.yeti
--- a/yetilab/transform/window.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/transform/window.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,8 +1,8 @@
 
-module window;
+module yetilab.transform.window;
 
-b = load block;
-bf = load blockfuncs;
+b = load yetilab.block.block;
+bf = load yetilab.block.blockfuncs;
 
 cosinewin a0 a1 a2 a3 n =
     b.fromList
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/vamp/test/test_vamppost.yeti
--- a/yetilab/vamp/test/test_vamppost.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/vamp/test/test_vamppost.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,8 +1,8 @@
-module test.test_vamppost;
+module yetilab.vamp.test.test_vamppost;
 
-vp = load vamppost;
+vp = load yetilab.vamp.vamppost;
 
-{ compare } = load test.test;
+{ compare } = load yetilab.test.test;
 
 untimed n = { timestamp = Untimed (), values = [n] };
 timed t n = { timestamp = Time t, values = [n] };
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/vamp/vamp.yeti
--- a/yetilab/vamp/vamp.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/vamp/vamp.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,4 +1,4 @@
-module vamp;
+module yetilab.vamp.vamp;
 
 import org.vamp_plugins:
        Plugin, Plugin$InputDomain,
@@ -10,10 +10,10 @@
 
 import java.util: Map, List;
 
-block = load block;
-fr = load framer;
-af = load audiofile;
-vamprdf = load vamprdf;
+block = load yetilab.block.block;
+fr = load yetilab.stream.framer;
+af = load yetilab.stream.audiofile;
+vamprdf = load yetilab.vamp.vamprdf;
 
 store = load yertle.store;
 
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/vamp/vamppost.yeti
--- a/yetilab/vamp/vamppost.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/vamp/vamppost.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,6 +1,6 @@
-module vamppost;
+module yetilab.vamp.vamppost;
 
-fmat = load fmatrix;
+fmat = load yetilab.block.fmatrix;
 
 fillOneSamplePerStep config features =
    (fill' n pending features =
diff -r 77d3292bbf12 -r d0abc9afe608 yetilab/vamp/vamprdf.yeti
--- a/yetilab/vamp/vamprdf.yeti	Wed Mar 20 09:57:54 2013 +0000
+++ b/yetilab/vamp/vamprdf.yeti	Wed Mar 20 10:09:54 2013 +0000
@@ -1,5 +1,5 @@
 
-module vamprdf;
+module yetilab.vamp.vamprdf;
 
 read = load yertle.read;
 { newRdfStore } = load yertle.store;