After Union and Relation

[helm.git] / helm / ocaml / mathql_interpreter / intersect.ml

diff --git a/helm/ocaml/mathql_interpreter/intersect.ml b/helm/ocaml/mathql_interpreter/intersect.ml
index 9a0f408efbcb490d6fb217e3f6fe0e26e15ea592..8a2f55ff224cec02d1392560c171af73eca81e9d 100644 (file)
--- a/helm/ocaml/mathql_interpreter/intersect.ml
+++ b/helm/ocaml/mathql_interpreter/intersect.ml
@@ -23,7 +23,6 @@
  * http://cs.unibo.it/helm/.
  *)
 
-exception NotCompatible;;
 
 (* Catenates two lists preserving order and getting rid of duplicates *)
 let rec append (l1,l2) =
@@ -48,7 +47,7 @@ let rec sum_groups(gr1, gr2) =
 
 ;;
 
-(* Product between an attribute set and a gropu of attributes *)
+(* Product between an attribute set and a group of attributes *)
 let rec sub_prod (aset, gr) =           (*prende un aset e un gr e fa la somma tra tutti i gruppi di aset e gr *)
   match aset with
       [] -> []
@@ -65,18 +64,33 @@ let rec prod (as1, as2) =
 ;;
 
 (* Intersection between two resource sets, preserves order and gets rid of duplicates *)
-let rec intersect_ex rs1 rs2 =
-  match (rs1, rs2) with
-     [],_
-   | _,[] -> []
-   | (uri1,as1)::tl1,
-     (uri2,as2)::_ when uri1 < uri2 -> intersect_ex tl1 rs2
-   | (uri1,as1)::_,
-     (uri2,as2)::tl2 when uri2 < uri1 -> intersect_ex rs1 tl2
-   | (uri1,as1)::tl1,
-     (uri2,as2)::tl2 -> (uri1, prod(as1,as2))::intersect_ex tl1 tl2 
+let intersect_ex rs1 rs2 =
+  let rec intersect_aux rs1 rs2 =
+    match (rs1, rs2) with
+       [],_
+     | _,[] -> []
+     | (uri1,_)::tl1,
+       (uri2,_)::_ when uri1 < uri2 -> intersect_aux tl1 rs2
+     | (uri1,_)::_,
+       (uri2,_)::tl2 when uri2 < uri1 -> intersect_aux rs1 tl2
+     | (uri1,as1)::tl1,
+       (uri2,as2)::tl2 -> (uri1, prod(as1,as2))::intersect_aux tl1 tl2 
+  in
+  let before = Sys.time () in
+  let res = intersect_aux rs1 rs2 in
+  let after = Sys.time () in
+  let ll1 = string_of_int (List.length rs1) in
+  let ll2 = string_of_int (List.length rs2) in
+  let diff = string_of_float (after -. before) in
+  print_endline
+   ("INTERSECT(" ^ ll1 ^ "," ^ ll2 ^ ") = " ^ string_of_int (List.length res) ^
+    ": " ^ diff ^ "s") ;
+  flush stdout ;
+  res
 ;;
 
+(*
+
 let intersect_ex l1 l2 =
  (* PRE-CLAUDIO
  (*let _ = print_string ("INTERSECT ")
@@ -129,9 +143,9 @@ let intersect_ex l1 l2 =
    in
     (*let _ = print_endline (string_of_float (Unix.time () -. t)); flush stdout in*)
     result*)
- let before = Unix.time () in
+ let before = Sys.time () in
  let res = intersect_ex l1 l2 in
- let after = Unix.time () in
+ let after = Sys.time () in
   let ll1 = string_of_int (List.length l1) in
   let ll2 = string_of_int (List.length l2) in
   let diff = string_of_float (after -. before) in
@@ -141,3 +155,5 @@ let intersect_ex l1 l2 =
   flush stdout ;
   res
 ;;
+
+*)