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

scalar_product and a fix

This commit is contained in:
Vitor Santos Costa 2013-09-11 14:53:43 +01:00
parent b30f0eafdf
commit 23b860a977
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/gecode/clp_examples/test.yap
View File

@ -15,3 +15,10 @@ test2(X) :-
X in 1..10,
X / 4 #= 2,
labeling([], [X]).
test3(A) :-
A = [X,Y,Z],
A ins 1..4,
Y #> 2,
lex_chain(A),
all_different(A),
labeling([], [X,Y,Z]).

13
library/gecode/clpfd.yap
View File

@ -34,12 +34,12 @@
all_distinct/2,
maximize/1,
sum/3,
lex_chain/1,
scalar_product/4, /*
tuples_in/2, */
labeling/2 /*,
label/1,
indomain/1,
lex_chain/1,
serialized/2,
global_cardinality/2,
global_cardinality/3,
@ -194,6 +194,9 @@ all_distinct( Cs, Xs ) :-
scalar_product( Cs, Vs, Rels, X ) :-
get_home(Env),
post( scalar_product( Cs, Vs, Rels, X ), Env, _ ).
lex_chain( Cs ) :-
get_home(Env),
post( rel( Cs, '#=<' ), Env, _ ).
labeling(_Opts, Xs) :-
get_home(Space-Map),
@ -245,6 +248,12 @@ post( rel( sum(L), Op, Out), Space-Map, Reify):-
Space += linear(IL, GOP, IOut, Reify)
).
% [A,B,C,D] #< 3
post( rel( A, Op), Space-Map, Reify):-
checklist( var, A ), !,
maplist(ll(Map), A, IL ),
gecode_arith_op( Op, GOP ),
(var(Reify) -> Space += rel(IL, GOP) ;
Space += rel(IL, GOP, IB) ).
post( rel( A, Op, B), Space-Map, Reify):-
checklist( var, A ),
( var(B) -> l(B, IB, Map) ; integer(B) -> IB = B ), !,
@ -327,7 +336,7 @@ post( all_distinct( Cs , Xs ), Space-Map, Reify) :-
gecode_arith_op( (#=) , 'IRT_EQ' ).
gecode_arith_op( (#\=) , 'IRT_NQ' ).
gecode_arith_op( (#>) , 'IRT_GE' ).
gecode_arith_op( (#>) , 'IRT_GR' ).
gecode_arith_op( (#>=) , 'IRT_GQ' ).
gecode_arith_op( (#<) , 'IRT_LE' ).
gecode_arith_op( (#=<) , 'IRT_LQ' ).