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

fix operators.

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-10-05 23:53:47 +01:00
parent 9f00389e52
commit 427c3ecf54
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/matrix.yap
View File

@ -570,11 +570,11 @@ Unify _NElems_ with the type of the elements in _Matrix_.
*/ */
:- module( matrix, :- module( matrix,
[(<==)/2, op(600, xfx, '<=='), [(<==)/2, op(800, xfx, '<=='),
op(700, xfx, in), op(700, xfx, in),
op(700, xfx, ins), op(700, xfx, ins),
op(450, xfx, ..), % should bind more tightly than \/ op(450, xfx, ..), % should bind more tightly than \/
op(590, xfx, of), of/2, op(710, xfx, of), of/2,
matrix_new/3, matrix_new/3,
matrix_new/4, matrix_new/4,
matrix_new_set/4, matrix_new_set/4,
@ -664,11 +664,15 @@ Unify _NElems_ with the type of the elements in _Matrix_.
length( L, Size ), !, length( L, Size ), !,
foldl( norm_dim, Dims0, Dims, Bases, 1, Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, Size ),
X <== matrix( L, [dim=Dims,base=Bases] ). X <== matrix( L, [dim=Dims,base=Bases] ).
( X <== '[]'(Dims0, array) of Pattern ) :- ( X <== '[]'(Dims0, array) of Pattern ) :- !,
array_extension(Pattern, Goal), array_extension(Pattern, Goal),
foldl( norm_dim, Dims0, Dims, Bases, 1, Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, Size ),
call(Goal, Pattern, Dims, Size, L), call(Goal, Pattern, Dims, Size, L),
X <== matrix( L, [dim=Dims,base=Bases] ). X <== matrix( L, [dim=Dims,base=Bases] ).
( LHS <== RHS ) :-
rhs(RHS, R),
set_lhs( LHS, R).
norm_dim( I..J, D, I, P0, P) :- !, norm_dim( I..J, D, I, P0, P) :- !,
@ -678,10 +682,6 @@ norm_dim( I, I, 0, P0, P ) :-
P is P0*I. P is P0*I.
( LHS <== RHS ) :-
rhs(RHS, R),
set_lhs( LHS, R).
rhs(RHS, RHS) :- var(RHS), !. rhs(RHS, RHS) :- var(RHS), !.
% base case % base case
rhs(A, A) :- atom(A), !. rhs(A, A) :- atom(A), !.