Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / interpretor / aux.ml

diff --git a/interpretor/aux.ml b/interpretor/aux.ml
index 3bc11a6..7c21a61 100644 (file)
--- a/interpretor/aux.ml
+++ b/interpretor/aux.ml
@@ -5,8 +5,6 @@
        Created: 12/08/2013     Modified: 13/08/2013
 *)
 
        Created: 12/08/2013     Modified: 13/08/2013
 *)
 

-
-

 let array_map2 = fun f -> fun a -> fun b ->
   let n1 = Array.length a in
   let n2 = Array.length b in
 let array_map2 = fun f -> fun a -> fun b ->
   let n1 = Array.length a in
   let n2 = Array.length b in


@@ -18,4 +16,21 @@ let array_map3 = fun f -> fun a -> fun b -> fun c ->
   let n2 = Array.length b in
   let n3 = Array.length c in
   if n1 = n2 && n1 = n3 then Array.init n1 (fun i -> f a.(i) b.(i) c.(i))
   let n2 = Array.length b in
   let n3 = Array.length c in
   if n1 = n2 && n1 = n3 then Array.init n1 (fun i -> f a.(i) b.(i) c.(i))

-  else raise (Invalid_argument "Array.map2 size not matched.");;
+  else raise (Invalid_argument "Array.map3 size not matched.");;
+
+let decorate = fun s -> "    Faustine -> " ^ s;;
+
+let xor : bool -> bool -> bool =
+  fun a -> fun b -> (a || b) && (not (a && b));;
+
+let rint : float -> float = 
+  fun f -> 
+    if (f -. (floor f)) >= 0.5 then ceil f
+    else floor f;;
+
+let remainder_float : float -> float -> float = 
+  fun f1 -> fun f2 ->
+    let r = mod_float f1 f2 in
+    if (abs_float r) > ((abs_float f2) /. 2.) then
+      (if r *. f2 > 0. then (r -. f2) else (r +. f2))
+    else r;;