X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fmetadata%2FmetadataConstraints.ml;h=d7192bd7e75e12c65f1c0d12922ec6e5e3f31673;hb=5f94d6c85429545d90acc39a9b9fc9a2da33d567;hp=cb84601475f239463d668281bca7547583a1ef4a;hpb=abd2098b6c4a40b36bb4b950c607eb4b4a7852bc;p=helm.git

diff --git a/helm/software/components/metadata/metadataConstraints.ml b/helm/software/components/metadata/metadataConstraints.ml
index cb8460147..d7192bd7e 100644
--- a/helm/software/components/metadata/metadataConstraints.ml
+++ b/helm/software/components/metadata/metadataConstraints.ml
@@ -29,7 +29,7 @@ open Printf
 open MetadataTypes 
 
 let critical_value = 7
-let just_factor = 3
+let just_factor = 1
 
 module UriManagerSet = UriManager.UriSet
 module SetSet = Set.Make (UriManagerSet)
@@ -546,7 +546,12 @@ let compute_with_only ~(dbd:HMysql.dbd) ?(facts=false) ?(where = `Conclusion)
           maximal_prefixes)
     in
 (*     Printf.fprintf stderr "all: %d\n" (List.length all);flush_all (); *)
-    List.filter (function (_,uri) -> at_most ~dbd ~where constants uri) all in
+(*
+    List.filter (function (_,uri) -> 
+      at_most ~dbd ~where constants uri) 
+*)
+    all 
+    in
   let equal_to = compute_exactly ~dbd ~facts ~where main prefixes in
     greater_than @ equal_to
 
@@ -621,23 +626,28 @@ let sigmatch ~(dbd:HMysql.dbd) ?(facts=false) ?(where = `Conclusion)
       let subsets = power_upto just_factor constants in
       (* let _ = prerr_endline (("subsets: ")^
 	 (string_of_int (List.length subsets))) in *)
-      let types_no = List.length types in
-      List.map (function (n,l) -> (n+types_no,types@l)) subsets
+      let types_no = List.length types in 
+	if types_no > 0 then  
+          List.map (function (n,l) -> (n+types_no,types@l)) subsets
+	else subsets
     in
+    prerr_endline ("critical_value exceded..." ^ string_of_int constants_no);
     let all_constants = 
      let all = match main with None -> types | Some m -> m::types in
       List.fold_right UriManagerSet.add all constants
     in
      compute_with_only ~dbd ~where main subsets all_constants
   else
+    (prerr_endline ("all subsets..." ^ string_of_int constants_no);
     let subsets = 
       let subsets = power constants in
       let types_no = List.length types in
        if types_no > 0 then  
         (0,[]) :: List.map (function (n,l) -> (n+types_no,types@l)) subsets
        else subsets
-      in
-       compute_exactly ~dbd ~facts ~where main subsets
+    in
+       prerr_endline "fine1";
+       compute_exactly ~dbd ~facts ~where main subsets)
 
   (* match query wrappers *)