steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

math.vectors: separate "dot product" from "Hermitian inner product". Fixes #484.

db4
John Benediktsson 2012-03-29 10:56:39 -07:00
parent 70f0b151fb
commit 4f046a2339
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/math/matrices/matrices.factor
View File

@ -124,7 +124,7 @@ IN: math.matrices
dupd proj v- ; dupd proj v- ;
: angle-between ( v u -- a ) : angle-between ( v u -- a )
[ normalize ] bi@ v. acos ; [ normalize ] bi@ h. acos ;
: (gram-schmidt) ( v seq -- newseq ) : (gram-schmidt) ( v seq -- newseq )
[ dupd proj v- ] each ; [ dupd proj v- ] each ;

4
basis/math/vectors/vectors-docs.factor
View File

@ -289,6 +289,10 @@ HELP: v.
{ $values { "u" "a sequence of real numbers" } { "v" "a sequence of real numbers" } { "x" "a real number" } } { $values { "u" "a sequence of real numbers" } { "v" "a sequence of real numbers" } { "x" "a real number" } }
{ $description "Computes the dot product of two vectors." } ; { $description "Computes the dot product of two vectors." } ;
HELP: h.
{ $values { "u" "a sequence of real numbers" } { "v" "a sequence of real numbers" } { "x" "a real number" } }
{ $description "Computes the Hermitian inner product of two vectors." } ;
HELP: vs+ HELP: vs+
{ $values { "u" "a sequence of numbers" } { "v" "a sequence of numbers" } { "w" "a sequence of numbers" } } { $values { "u" "a sequence of numbers" } { "v" "a sequence of numbers" } { "w" "a sequence of numbers" } }
{ $description "Adds " { $snippet "u" } " and " { $snippet "v" } " component-wise with saturation." } { $description "Adds " { $snippet "u" } " and " { $snippet "v" } " component-wise with saturation." }

5
basis/math/vectors/vectors-tests.factor
View File

@ -23,4 +23,7 @@ SPECIALIZED-ARRAY: int
[ { 0 3 2 5 4 } ] [ { 1 2 3 4 5 } { 1 1 1 1 1 } v+- ] unit-test [ { 0 3 2 5 4 } ] [ { 1 2 3 4 5 } { 1 1 1 1 1 } v+- ] unit-test
[ 1 ] [ { C{ 0 1 } } dup v. ] unit-test [ 32 ] [ { 1 2 3 } { 4 5 6 } v. ] unit-test
[ -1 ] [ { C{ 0 1 } } dup v. ] unit-test
[ 1 ] [ { C{ 0 1 } } dup h. ] unit-test

5
basis/math/vectors/vectors.factor
View File

@ -208,7 +208,10 @@ M: object v?
: vinfimum ( seq -- vmin ) [ ] [ vmin ] map-reduce ; inline : vinfimum ( seq -- vmin ) [ ] [ vmin ] map-reduce ; inline
GENERIC: v. ( u v -- x ) GENERIC: v. ( u v -- x )
M: object v. [ conjugate * ] [ + ] 2map-reduce ; inline M: object v. [ * ] [ + ] 2map-reduce ; inline
GENERIC: h. ( u v -- x )
M: object h. [ conjugate * ] [ + ] 2map-reduce ; inline
GENERIC: norm-sq ( v -- x ) GENERIC: norm-sq ( v -- x )
M: object norm-sq [ absq ] [ + ] map-reduce ; inline M: object norm-sq [ absq ] [ + ] map-reduce ; inline