diff options
author | Alex Auvolat--bernstein <auvolat@clipper.ens.fr> | 2013-12-04 17:35:16 +0100 |
---|---|---|
committer | Alex Auvolat--bernstein <auvolat@clipper.ens.fr> | 2013-12-04 17:35:16 +0100 |
commit | 11f09faf92b4b915316be0e5640e2e0e8cd806c8 (patch) | |
tree | 91ea5699330a59b4d25ae36f617888a02fb6bb35 /set_bitsets.c | |
parent | 71094b2d48ac784e60d454609064d20e83c017be (diff) | |
download | AlgoProg-Projet-11f09faf92b4b915316be0e5640e2e0e8cd806c8.tar.gz AlgoProg-Projet-11f09faf92b4b915316be0e5640e2e0e8cd806c8.zip |
Added heuristic.
Diffstat (limited to 'set_bitsets.c')
-rw-r--r-- | set_bitsets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/set_bitsets.c b/set_bitsets.c index fda7085..7eddcfd 100644 --- a/set_bitsets.c +++ b/set_bitsets.c @@ -138,8 +138,8 @@ int elt_of_set(const set s){ int elt_of_set_heur(const set s, int h){ int N=nbCells(s.N), i; - if(s.tab[h/SCOD]>>(h%SCOD+1) !=0) - return h + dyadic_val(s.tab[h/SCOD]>>(h%SCOD+1)) + 1; + if(s.tab[h/SCOD]>>(h%SCOD) !=0) + return h + dyadic_val(s.tab[h/SCOD]>>(h%SCOD)) ; for(i=0; i<N; i++) if(s.tab[(i+h/SCOD+1)%N] != 0) |