diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix FloatVar code

Browse Source
This commit is contained in:
Vítor Santos Costa 2013-09-04 17:11:22 +01:00
parent 614e7ab856
commit 90c70459be
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/gecode/gecode4_yap_hand_written.yap
View File

@ -43,9 +43,9 @@ is_IntVarBranch_('IntVarBranch'(I,K),N) :-
integer(K), integer(K),
nb_getval(gecode_space_use_keep_index,B), nb_getval(gecode_space_use_keep_index,B),
(B=true -> N=K ; N=I). (B=true -> N=K ; N=I).
is_FloatVar_('IntVar'(I,K),N) :- is_FloatVar_('FloatVar'(I,K),N) :-
float(I), integer(I),
float(K), integer(K),
nb_getval(gecode_space_use_keep_index,B), nb_getval(gecode_space_use_keep_index,B),
(B=true -> N=K ; N=I). (B=true -> N=K ; N=I).
is_BoolVar_('BoolVar'(I,K),N) :- is_BoolVar_('BoolVar'(I,K),N) :-
@ -144,6 +144,8 @@ assert_var(X,Y) :-
var(X) -> X=Y; throw(gecode_error(expected(var))). var(X) -> X=Y; throw(gecode_error(expected(var))).
assert_is_int(X,Y) :- assert_is_int(X,Y) :-
integer(X) -> X=Y ; throw(gecode_error(expected(int))). integer(X) -> X=Y ; throw(gecode_error(expected(int))).
assert_is_float(X,Y) :-
float(X) -> X=Y ; throw(gecode_error(expected(int))).
assert_is_Space(X,Y) :- assert_is_Space(X,Y) :-
is_Space(X,Y) -> true ; throw(gecode_error(expected(space))). is_Space(X,Y) -> true ; throw(gecode_error(expected(space))).
assert_is_IntSet(X,Y) :- assert_is_IntSet(X,Y) :-
@ -173,6 +175,7 @@ assert_is_ReifyMode(X,Y) :-
assert_var(X) :- assert_var(X,_). assert_var(X) :- assert_var(X,_).
assert_is_int(X) :- assert_is_int(X,_). assert_is_int(X) :- assert_is_int(X,_).
assert_is_float(X) :- assert_is_float(X,_).
assert_is_Space(X) :- assert_is_Space(X,_). assert_is_Space(X) :- assert_is_Space(X,_).
assert_is_IntSet(X) :- assert_is_IntSet(X,_). assert_is_IntSet(X) :- assert_is_IntSet(X,_).
assert_is_IntVar(X) :- assert_is_IntVar(X,_). assert_is_IntVar(X) :- assert_is_IntVar(X,_).