From 0c8a4717f2bc8bb923effb6c1cf6f54045124c60 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 1 Oct 2009 13:21:10 -0500 Subject: [PATCH] add software vall?, vany?, vnone? words --- basis/math/vectors/vectors-docs.factor | 23 +++++++++++++++++------ basis/math/vectors/vectors.factor | 6 ++++-- extra/math/matrices/simd/simd.factor | 16 ++++++++-------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/basis/math/vectors/vectors-docs.factor b/basis/math/vectors/vectors-docs.factor index 9b6f0a04f1..547021afdb 100644 --- a/basis/math/vectors/vectors-docs.factor +++ b/basis/math/vectors/vectors-docs.factor @@ -61,8 +61,11 @@ ARTICLE: "math-vectors-logic" "Vector componentwise logic" { $subsection vand } { $subsection vor } { $subsection vxor } -{ $subsection vmask } { $subsection v? } +"Entire vector tests:" +{ $subsection vall? } +{ $subsection vany? } +{ $subsection vnone? } "Element shuffling:" { $subsection vshuffle } ; @@ -338,20 +341,28 @@ HELP: vnot { $values { "u" "a sequence of booleans" } { "w" "a sequence of booleans" } } { $description "Takes the logical NOT of each element of " { $snippet "u" } "." } ; -HELP: vmask -{ $values { "u" "a sequence of numbers" } { "?" "a sequence of booleans" } { "u'" "a sequence of numbers" } } -{ $description "Returns a copy of " { $snippet "u" } " with the elements for which the corresponding element of " { $snippet "?" } " is false replaced by zero." } ; - HELP: v? { $values { "mask" "a sequence of booleans" } { "true" "a sequence of numbers" } { "false" "a sequence of numbers" } { "w" "a sequence of numbers" } } { $description "Creates a new sequence by selecting elements from the " { $snippet "true" } " and " { $snippet "false" } " sequences based on whether the corresponding bits of the " { $snippet "mask" } " sequence are set or not." } ; +HELP: vany? +{ $values { "v" "a sequence of booleans" } { "?" "a boolean" } } +{ $description "Returns true if any element of " { $snippet "v" } " is true." } ; + +HELP: vall? +{ $values { "v" "a sequence of booleans" } { "?" "a boolean" } } +{ $description "Returns true if every element of " { $snippet "v" } " is true." } ; + +HELP: vnone? +{ $values { "v" "a sequence of booleans" } { "?" "a boolean" } } +{ $description "Returns true if every element of " { $snippet "v" } " is false." } ; + { 2map v+ v- v* v/ } related-words { 2reduce v. } related-words { vs+ vs- vs* } related-words -{ v< v<= v= v> v>= vunordered? vand vor vxor vnot vmask v? } related-words +{ v< v<= v= v> v>= vunordered? vand vor vxor vnot vany? vall? vnone? v? } related-words { vbitand vbitandn vbitor vbitxor vbitnot } related-words diff --git a/basis/math/vectors/vectors.factor b/basis/math/vectors/vectors.factor index ffb761c543..c2bfb3f295 100644 --- a/basis/math/vectors/vectors.factor +++ b/basis/math/vectors/vectors.factor @@ -92,6 +92,10 @@ PRIVATE> : vxor ( u v -- w ) [ xor ] 2map ; : vnot ( u -- w ) [ not ] map ; +: vall? ( v -- ? ) [ ] all? ; +: vany? ( v -- ? ) [ ] any? ; +: vnone? ( v -- ? ) [ not ] all? ; + : v< ( u v -- w ) [ < ] { } 2map-as ; : v<= ( u v -- w ) [ <= ] { } 2map-as ; : v>= ( u v -- w ) [ >= ] { } 2map-as ; @@ -102,8 +106,6 @@ PRIVATE> : v? ( mask true false -- w ) [ vbitand ] [ vbitandn ] bi-curry* bi vbitor ; inline -: vmask ( u ? -- u' ) vbitand ; inline - : vfloor ( u -- v ) [ floor ] map ; : vceiling ( u -- v ) [ ceiling ] map ; : vtruncate ( u -- v ) [ truncate ] map ; diff --git a/extra/math/matrices/simd/simd.factor b/extra/math/matrices/simd/simd.factor index fc6c2a03f8..16960993b6 100644 --- a/extra/math/matrices/simd/simd.factor +++ b/extra/math/matrices/simd/simd.factor @@ -132,7 +132,7 @@ TYPED:: m4^n ( m: matrix4 n: fixnum -- m^n: matrix4 ) TYPED:: scale-matrix4 ( factors: float-4 -- matrix: matrix4 ) matrix4 (struct) :> c - factors float-4{ t t t f } vmask :> factors' + factors float-4{ t t t f } vbitand :> factors' factors' { 0 3 3 3 } vshuffle factors' { 3 1 3 3 } vshuffle @@ -150,9 +150,9 @@ TYPED:: translation-matrix4 ( offset: float-4 -- matrix: matrix4 ) float-4{ 0.0 0.0 0.0 1.0 } :> c4 float-4{ t t t f } offset c4 v? :> offset' - offset' { 3 3 3 0 } vshuffle float-4{ t f f t } vmask - offset' { 3 3 3 1 } vshuffle float-4{ f t f t } vmask - offset' { 3 3 3 2 } vshuffle float-4{ f f t t } vmask + offset' { 3 3 3 0 } vshuffle float-4{ t f f t } vbitand + offset' { 3 3 3 1 } vshuffle float-4{ f t f t } vbitand + offset' { 3 3 3 2 } vshuffle float-4{ f f t t } vbitand c4 c set-rows ; @@ -177,7 +177,7 @@ TYPED:: rotation-matrix4 ( axis: float-4 theta: float -- matrix: matrix4 ) axis2 cc ones axis2 v- v* v+ :> diagonal axis { 1 0 0 3 } vshuffle axis { 2 2 1 3 } vshuffle v* 1-c v* - float-4{ t t t f } vmask :> triangle-a + float-4{ t t t f } vbitand :> triangle-a ss axis v* triangle-sign v* :> triangle-b triangle-a triangle-b v+ :> triangle-lo triangle-a triangle-b v- :> triangle-hi @@ -200,9 +200,9 @@ TYPED:: frustum-matrix4 ( xy: float-4 near: float far: float -- matrix: matrix4 float-4{ t t f f } xy near far - float-4-with v? :> denom num denom v/ :> fov - fov { 0 0 0 0 } vshuffle float-4{ t f f f } vmask - fov { 1 1 1 1 } vshuffle float-4{ f t f f } vmask - fov { 2 2 2 3 } vshuffle float-4{ f f t t } vmask + fov { 0 0 0 0 } vshuffle float-4{ t f f f } vbitand + fov { 1 1 1 1 } vshuffle float-4{ f t f f } vbitand + fov { 2 2 2 3 } vshuffle float-4{ f f t t } vbitand float-4{ 0.0 0.0 -1.0 0.0 } c set-rows ;