X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/8c48d01c4b78dba6159c13438b06cb7e07a1f338..f1f94803668061f90a5ce88bf06ee72bba8e41a5:/interpretor/types.ml

diff --git a/interpretor/types.ml b/interpretor/types.ml
index dae188f..0b7cfde 100644
--- a/interpretor/types.ml
+++ b/interpretor/types.ml
@@ -42,6 +42,8 @@ class type value_type =
     method _mod : value_type -> value_type
     method larger : value_type -> value_type
     method smaller : value_type -> value_type
+    method max : value_type -> value_type
+    method min : value_type -> value_type
   end;;
 
 
@@ -68,6 +70,8 @@ type symbol = Add
 	    | Serialize
 	    | Larger
 	    | Smaller
+	    | Max
+	    | Min
 	    | Prefix
 	    | Select2
 	    | Select3
@@ -83,9 +87,21 @@ type faust_exp =
        | Merge of faust_exp * faust_exp
 
 
+class type rate_type = 
+  object
+    method to_int : int
+    method to_float : float 
+    method to_string : string
+    method num : int
+    method denom : int
+    method equal : rate_type -> bool
+    method mul : int -> rate_type
+    method div : int -> rate_type
+  end
+
 class type signal_type = 
     object
-      method frequency : int
+      method frequency : rate_type
       method at : time -> value_type
       method add_memory : int -> unit
       method add : signal_type -> signal_type
@@ -109,12 +125,17 @@ class type signal_type =
       method _mod : signal_type -> signal_type
       method larger : signal_type -> signal_type
       method smaller : signal_type -> signal_type
+      method max : signal_type -> signal_type
+      method min : signal_type -> signal_type
       method rdtable : signal_type -> signal_type -> signal_type
       method select2 : signal_type -> signal_type -> signal_type
       method select3 : signal_type -> signal_type -> signal_type -> signal_type
       method prefix : signal_type -> signal_type
     end;;
 
+type matrix = float array array;;
+
+type data = float array array array;;
 
 class type beam_type =
     object
@@ -125,8 +146,8 @@ class type beam_type =
       method append : beam_type -> beam_type
       method matching : int -> beam_type
       method at : time -> value_type array
-      method output : int -> float array array array
-      method frequency : int array
+      method output : int -> data
+      method frequency : rate_type array
     end;;
 
 
@@ -155,5 +176,5 @@ class type io_type =
     object
       method set : string -> string -> unit
       method read : string array -> beam_type
-      method write : int array -> float array array array -> string array
+      method write : rate_type array -> data -> string array
     end;;