Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/biocham/biocham

invariants.pl

 :- use_module(library(clpfd)).
 :- use_module(library(lists)).
 
-fd_max_integer(268435455).
-
 
 cpu_time(T) :-
    statistics(walltime, [T, _]).
@@ -25,8 +23,7 @@ cpu_time(T) :-
 % find the complete set of minimal P-invariants
 
 find_all_pinvar :-
-   fd_max_integer(MaxInt),
-   find_pinvar(MaxInt).
+   find_pinvar(sup).
 
 
 find_pinvar :-
@@ -117,7 +114,13 @@ find_invar(IOList, ForcedMax, Operator) :-
    get_constraints(UIOList, [], [], Vars, VarList, 1, MaxDomain1, Operator),
    retractall(vars(_)),
    assertz(vars(Vars)),
-   MaxDomain is min(MaxDomain1, ForcedMax),
+   (
+      ForcedMax == sup
+   ->
+      MaxDomain = MaxDomain1
+   ;
+      MaxDomain is min(MaxDomain1, ForcedMax)
+   ),
    % add a large upper bound for minimal invariants
    VarList ins 0..MaxDomain,
    format_debug(4, "~w~n", [MaxDomain]),