From 1e413edf3a1885a95d2985397998cb351d1c53fe Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 6 Nov 2012 07:16:20 -0800 Subject: [PATCH] math.statistics: rename full-* to population-*. --- basis/math/statistics/statistics-docs.factor | 8 ++++---- basis/math/statistics/statistics-tests.factor | 6 +++--- basis/math/statistics/statistics.factor | 10 +++++----- extra/math/similarity/similarity.factor | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/basis/math/statistics/statistics-docs.factor b/basis/math/statistics/statistics-docs.factor index d3b9e73f41..a4cb761c31 100644 --- a/basis/math/statistics/statistics-docs.factor +++ b/basis/math/statistics/statistics-docs.factor @@ -294,7 +294,7 @@ ARTICLE: "math.statistics" "Statistics" ABOUT: "math.statistics" -{ var full-var sample-var } related-words -{ std full-std sample-std } related-words -{ ste full-ste sample-ste } related-words -{ corr full-corr sample-corr } related-words +{ var population-var sample-var } related-words +{ std population-std sample-std } related-words +{ ste population-ste sample-ste } related-words +{ corr population-corr sample-corr } related-words diff --git a/basis/math/statistics/statistics-tests.factor b/basis/math/statistics/statistics-tests.factor index b4082813c5..396f9842b4 100644 --- a/basis/math/statistics/statistics-tests.factor +++ b/basis/math/statistics/statistics-tests.factor @@ -55,10 +55,10 @@ IN: math.statistics.tests [ 1 ] [ { 1 2 3 } var ] unit-test [ 16 ] [ { 4 6 8 10 10 12 14 16 } var ] unit-test -{ 16 } [ { 4 6 8 10 12 14 16 } full-var ] unit-test +{ 16 } [ { 4 6 8 10 12 14 16 } population-var ] unit-test { 1.0 } [ { 7 8 9 } std ] unit-test { 2/3 } [ { 7 8 9 } 0 var-ddof ] unit-test -{ 2/3 } [ { 7 8 9 } full-var ] unit-test +{ 2/3 } [ { 7 8 9 } population-var ] unit-test { 1 } [ { 7 8 9 } 1 var-ddof ] unit-test { 1 } [ { 7 8 9 } var ] unit-test { 1 } [ { 7 8 9 } sample-var ] unit-test @@ -66,7 +66,7 @@ IN: math.statistics.tests { 0 } [ { 7 8 9 } 3 var-ddof ] unit-test { t } [ { 7 8 9 } 0 std-ddof 0.816496580927726 .0001 ~ ] unit-test -{ t } [ { 7 8 9 } full-std 0.816496580927726 .0001 ~ ] unit-test +{ t } [ { 7 8 9 } population-std 0.816496580927726 .0001 ~ ] unit-test { 1.0 } [ { 7 8 9 } 1 std-ddof ] unit-test { 1.0 } [ { 7 8 9 } std ] unit-test { 1.0 } [ { 7 8 9 } sample-std ] unit-test diff --git a/basis/math/statistics/statistics.factor b/basis/math/statistics/statistics.factor index 0e69a3c364..c94565482f 100644 --- a/basis/math/statistics/statistics.factor +++ b/basis/math/statistics/statistics.factor @@ -261,8 +261,8 @@ PRIVATE> [ [ sum-of-squared-errors ] [ length ] bi ] dip - / ] if ; inline -: full-var ( seq -- x ) 0 var-ddof ; inline - +: population-var ( seq -- x ) 0 var-ddof ; inline + : sample-var ( seq -- x ) 1 var-ddof ; inline ALIAS: var sample-var @@ -270,7 +270,7 @@ ALIAS: var sample-var : std-ddof ( seq n -- x ) var-ddof sqrt ; inline -: full-std ( seq -- x ) 0 std-ddof ; inline +: population-std ( seq -- x ) 0 std-ddof ; inline : sample-std ( seq -- x ) 1 std-ddof ; inline @@ -284,7 +284,7 @@ ALIAS: std sample-std : ste-ddof ( seq n -- x ) '[ _ std-ddof ] [ length ] bi sqrt / ; -: full-ste ( seq -- x ) 0 ste-ddof ; +: population-ste ( seq -- x ) 0 ste-ddof ; : sample-ste ( seq -- x ) 1 ste-ddof ; @@ -324,7 +324,7 @@ ALIAS: ste sample-ste [ [ cov ] ] dip '[ [ _ var-ddof ] bi@ * sqrt ] 2bi / ; -: full-corr ( {x} {y} -- corr ) 0 corr-ddof ; inline +: population-corr ( {x} {y} -- corr ) 0 corr-ddof ; inline : sample-corr ( {x} {y} -- corr ) 1 corr-ddof ; inline diff --git a/extra/math/similarity/similarity.factor b/extra/math/similarity/similarity.factor index b1f78569c0..133537ac4d 100644 --- a/extra/math/similarity/similarity.factor +++ b/extra/math/similarity/similarity.factor @@ -9,7 +9,7 @@ IN: math.similarity v- norm 1 + recip ; : pearson-similarity ( a b -- n ) - over length 3 < [ 2drop 1.0 ] [ full-corr 0.5 * 0.5 + ] if ; + over length 3 < [ 2drop 1.0 ] [ population-corr 0.5 * 0.5 + ] if ; : cosine-similarity ( a b -- n ) [ v* sum ] [ [ norm ] bi@ * ] 2bi / 0.5 * 0.5 + ;