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

use of as part of the phrase, not as main operatorSr

Browse Source
This commit is contained in:
Vitor Santos Costa 2014-09-23 22:39:20 +01:00
parent 429e87404f
commit ed3f0a8b74
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/matrix.yap
View File

@ -86,7 +86,7 @@ contact the YAP maintainers if you require extra functionality.
+ _X_ = array[ _Dim1_,..., _Dimn_] of _Objects_ + _X_ <== array[ _Dim1_,..., _Dimn_] of _Objects_
The of/2 operator can be used to create a new array of The of/2 operator can be used to create a new array of
_Objects_. The objects supported are: _Objects_. The objects supported are:
@ -137,7 +137,7 @@ typedef enum {
General matrix assignment operation. It evaluates the right-hand side General matrix assignment operation. It evaluates the right-hand side
and then acts different according to the according to the
left-hand side and to the matrix: left-hand side and to the matrix:
+ if _LHS_ is part of an integer or floating-point matrix, + if _LHS_ is part of an integer or floating-point matrix,
@ -567,11 +567,11 @@ Unify _NElems_ with the type of the elements in _Matrix_.
*/ */
:- module( matrix, :- module( matrix,
[op(100, yf, []), [op(100, yf, []),
(<==)/2, op(600, xfx, '<=='), (<==)/2, op(710, xfx, '<=='),
op(700, xfx, in), op(580, xfx, in),
op(700, xfx, ins), op(580, xfx, ins),
op(450, xfx, ..), % should bind more tightly than \/ op(450, xfx, ..), % should bind more tightly than \/
op(710, xfx, of), of/2, op(590, xfx, of), of/2,
matrix_new/3, matrix_new/3,
matrix_new/4, matrix_new/4,
matrix_new_set/4, matrix_new_set/4,
@ -639,29 +639,29 @@ Unify _NElems_ with the type of the elements in _Matrix_.
:- use_module(library(mapargs)). :- use_module(library(mapargs)).
:- use_module(library(lists)). :- use_module(library(lists)).
( X = '[]'(Dims0, array) of V ) :- ( X <== '[]'(Dims0, array) of V ) :-
var(V), !, var(V), !,
foldl( norm_dim, Dims0, Dims, Bases, 1, Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, Size ),
length( L, Size ), length( L, Size ),
X <== matrix( L, [dim=Dims,base=Bases] ). X <== matrix( L, [dim=Dims,base=Bases] ).
( X = '[]'(Dims0, array) of ints ) :- !, ( X <== '[]'(Dims0, array) of ints ) :- !,
foldl( norm_dim, Dims0, Dims, Bases, 1, _Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, _Size ),
matrix_new( ints , Dims, X ), matrix_new( ints , Dims, X ),
matrix_base(X, Bases). matrix_base(X, Bases).
( X = '[]'(Dims0, array) of floats ) :- !, ( X <== '[]'(Dims0, array) of floats ) :- !,
foldl( norm_dim, Dims0, Dims, Bases, 1, _Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, _Size ),
matrix_new( floats , Dims, X ), matrix_new( floats , Dims, X ),
matrix_base(X, Bases). matrix_base(X, Bases).
( X = '[]'(Dims0, array) of (I:J) ) :- !, ( X <== '[]'(Dims0, array) of (I:J) ) :- !,
foldl( norm_dim, Dims0, Dims, Bases, 1, Size ), foldl( norm_dim, Dims0, Dims, Bases, 1, Size ),
matrix_seq(I, J, Dims, X), matrix_seq(I, J, Dims, X),
matrixn_size(X, Size), matrixn_size(X, Size),
matrix_base(X, Bases). matrix_base(X, Bases).
( X = '[]'(Dims0, array) of L ) :- ( X <== '[]'(Dims0, array) of L ) :-
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),