changeset 482:d7e4ae45fc1d opaque_type_references

More type fixes
author Chris Cannam
date Fri, 01 Nov 2013 18:18:24 +0000
parents 3a23f12e6bee
children b510661536a6
files src/may/matrix/test/test_complexmatrix.yeti src/may/stream/convolve.yeti src/may/stream/manipulate.yeti src/may/stream/resample.yeti src/may/stream/syntheticstream.yeti
diffstat 5 files changed, 4 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/may/matrix/test/test_complexmatrix.yeti	Fri Nov 01 18:16:02 2013 +0000
+++ b/src/may/matrix/test/test_complexmatrix.yeti	Fri Nov 01 18:18:24 2013 +0000
@@ -6,10 +6,6 @@
 cm = load may.matrix.complex;
 complex = load may.complex;
 
-load may.vector.type;
-load may.matrix.type;
-load may.matrix.complextype;
-
 { compare, compareUsing } = load may.test.test;
 
 [
--- a/src/may/stream/convolve.yeti	Fri Nov 01 18:16:02 2013 +0000
+++ b/src/may/stream/convolve.yeti	Fri Nov 01 18:18:24 2013 +0000
@@ -10,8 +10,6 @@
 cplx = load may.complex;
 
 load may.stream.type;
-load may.vector.type;
-load may.matrix.type;
 
 //!!! todo: synchronized for everything with state assignment
 
@@ -149,6 +147,6 @@
     esac);
 
 {
-    convolvedWith is list<Fast boolean | Framesize number> -> matrix -> stream -> stream,
+    convolvedWith is list<Fast boolean | Framesize number> -> mat.matrix_t -> stream -> stream,
 }
 
--- a/src/may/stream/manipulate.yeti	Fri Nov 01 18:16:02 2013 +0000
+++ b/src/may/stream/manipulate.yeti	Fri Nov 01 18:18:24 2013 +0000
@@ -7,8 +7,6 @@
 maths = load may.mathmisc;
 
 load may.stream.type;
-load may.vector.type;
-load may.matrix.type;
 
 //!!! todo: synchronized for everything with state assignment
 
--- a/src/may/stream/resample.yeti	Fri Nov 01 18:16:02 2013 +0000
+++ b/src/may/stream/resample.yeti	Fri Nov 01 18:18:24 2013 +0000
@@ -10,8 +10,6 @@
 maths = load may.mathmisc;
 
 load may.stream.type;
-load may.vector.type;
-load may.matrix.type;
 
 //!!! todo: synchronized for everything with state assignment
 
--- a/src/may/stream/syntheticstream.yeti	Fri Nov 01 18:16:02 2013 +0000
+++ b/src/may/stream/syntheticstream.yeti	Fri Nov 01 18:18:24 2013 +0000
@@ -5,8 +5,6 @@
 vec = load may.vector;
 mat = load may.matrix;
 
-load may.vector.type;
-load may.matrix.type;
 load may.stream.type;
 
 generated sampleRate generator =
@@ -114,9 +112,9 @@
 
 {
     generated is number -> (number -> number) -> stream, 
-    precalculated is number -> matrix -> stream,
-    precalculatedMono is number -> vector -> stream,
-    precalculatedRepeated is number -> matrix -> stream,
+    precalculated is number -> mat.matrix_t -> stream,
+    precalculatedMono is number -> vec.vector_t -> stream,
+    precalculatedRepeated is number -> mat.matrix_t -> stream,
     sinusoid is number -> number -> stream, 
     whiteNoise is number -> stream,
     pulseTrain is number -> number -> stream,