From 7bbac9e5441f5fc78a30e03ca26ec2a21f5e8286 Mon Sep 17 00:00:00 2001 From: Andrea Asperti Date: Thu, 23 Nov 2006 14:41:25 +0000 Subject: [PATCH] Set of Set of uri added. --- components/metadata/metadataConstraints.ml | 12 ++++++++---- components/metadata/metadataConstraints.mli | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/components/metadata/metadataConstraints.ml b/components/metadata/metadataConstraints.ml index 6c373f180..d7192bd7e 100644 --- a/components/metadata/metadataConstraints.ml +++ b/components/metadata/metadataConstraints.ml @@ -626,8 +626,10 @@ 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 = @@ -636,14 +638,16 @@ let sigmatch ~(dbd:HMysql.dbd) ?(facts=false) ?(where = `Conclusion) 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 *) diff --git a/components/metadata/metadataConstraints.mli b/components/metadata/metadataConstraints.mli index 63757ae47..5b13f57a1 100644 --- a/components/metadata/metadataConstraints.mli +++ b/components/metadata/metadataConstraints.mli @@ -24,7 +24,7 @@ *) module UriManagerSet : Set.S with type elt = UriManager.uri - +module SetSet: Set.S with type elt = UriManagerSet.t (** @return * main: constant in main position and, for polymorphic constants, type -- 2.39.2