Added nth-root, renamed polynomial to polynomials

diff --git a/contrib/math/analysis.factor b/contrib/math/analysis.factor
index 16179ffc852f5cc987a2d5f6db4e63c8ae0a4f04..a5fb6a2c957378e27ee86c90d53749cf4b74c69a 100644 (file)
--- a/contrib/math/analysis.factor
+++ b/contrib/math/analysis.factor
@@ -55,3 +55,6 @@ IN: math-contrib
             dup abs gammaln-lanczos6 swap dup 0 > [ drop ] [ gamma-neg ] if
     ] if ;
 
+: nth-root ( n x -- )
+    log >r inv r> * e swap ^ ;
+

diff --git a/contrib/math/load.factor b/contrib/math/load.factor
index 7cdb139f7d0a74362c7991e5c09dd44e379af7fc..d5297cec15238398eceba9debb895959ed30a6b3 100644 (file)
--- a/contrib/math/load.factor
+++ b/contrib/math/load.factor
@@ -4,9 +4,10 @@ USING: parser sequences words compiler ;
     "contrib/math/utils.factor"
     "contrib/math/combinatorics.factor"
     "contrib/math/analysis.factor"
-    "contrib/math/polynomial.factor"
+    "contrib/math/polynomials.factor"
     "contrib/math/quaternions.factor"
     "contrib/math/matrices.factor"
+    "contrib/math/statistics.factor"
 ] [ run-file ] each
 
 "math-contrib" words [ try-compile ] each

diff --git a/contrib/math/polynomial.factor b/contrib/math/polynomial.factor
deleted file mode 100644 (file)
index 469c088..0000000
--- a/contrib/math/polynomial.factor
+++ /dev/null
@@ -1,99 +0,0 @@
-IN: polynomial-internals
-USING: kernel sequences vectors math math-internals namespaces ;
-
-: 2length ( seq seq -- ) [ length ] 2apply ;
-
-: zero-vector ( n -- vector ) 0 <repeated> >vector ;
-
-: nzero-pad ( n seq -- seq )
-    #! extend seq by n zeros
-    >r zero-vector r> swap nappend ;
-
-: zero-pad ( n seq -- seq )
-    #! extend seq by n zeros
-    >r zero-vector r> swap append ;
-
-: zero-pad-front ( n seq -- seq )
-    >r zero-vector r> append ;
-
-: zero-extend ( n seq -- )
-    #! extend seq to max(n,length) with 0s
-    [ length ] keep -rot - swap nzero-pad ;
-
-: 2zero-extend ( seq seq -- )
-    2dup max-length [ swap zero-extend ] keep swap zero-extend ;
-
-: pextend ( p p -- p p )
-    2dup 2zero-extend ;
-
-IN: math-contrib
-
-: p= ( p p -- )
-    pextend = ;
-
-: ptrim ( p -- p )
-    dup length 1 > [ dup peek 0 = [ dup pop drop ptrim ] when ] when ;
-
-: 2ptrim ( p -- p )
-    [ ptrim ] 2apply ;
-
-: p+ ( p p -- p )
-    pextend v+ ;
-
-: p- ( p p -- p )
-    pextend v- ;
-
-: n*p ( n p -- n*p )
-    n*v ;
-
-! convolution
-: (conv*a)
-    2dup swap length - rot zero-pad-front ;
-
-: conv*a ( seq seq -- seq seq )
-    2dup 2length + 1- (conv*a) reverse -rot (conv*a) swap ;
-
-: conv*b ( seq -- seq )
-    rot dup pop drop 1 zero-vector swap append -rot ;
-
-: conv ( p p -- p )
-    conv*a [ 3dup -rot v* sum >r pick r> -rot set-nth conv*b ] repeat nip ;
-
-! polynomial multiply
-: p* ( p p -- p )
-    conv ;
-
-: p-sq ( p -- p-sq )
-    dup p* ;
-
-IN: polynomial-internals
-
-: pop-front ( seq -- seq )
-    1 swap tail ;
-
-: /-last ( seq seq -- a )
-    #! divide the last two numbers in the sequences
-    [ peek ] 2apply /i ;
-
-: p/mod-setup
-    2ptrim 2dup 2length - dup 1 < [ drop 1 ] when
-    dup >r swap zero-pad-front pextend r> 1+ ;
-
-: (p/mod)
-    2dup /-last 2dup , n*p swapd p- dup pop drop swap pop-front ;
-
-IN: math
-
-: p/mod
-    p/mod-setup [ [ (p/mod) ] times ] { } make reverse nip swap 2ptrim pextend ;
-
-: (pgcd) ( b a y x -- a d )
-    dup { 0 } clone p= [
-        drop nip
-    ] [
-        tuck p/mod >r pick p* swap >r swapd p- r> r> (pgcd)
-    ] if ;
-    
-: pgcd ( p p -- p )
-    swap { 0 } clone { 1 } clone 2swap (pgcd) ;
-

diff --git a/contrib/math/polynomials.factor b/contrib/math/polynomials.factor
new file mode 100644 (file)
index 0000000..82946a7
--- /dev/null
+++ b/contrib/math/polynomials.factor
@@ -0,0 +1,99 @@
+IN: polynomials-internals
+USING: kernel sequences vectors math math-internals namespaces ;
+
+: 2length ( seq seq -- ) [ length ] 2apply ;
+
+: zero-vector ( n -- vector ) 0 <repeated> >vector ;
+
+: nzero-pad ( n seq -- seq )
+    #! extend seq by n zeros
+    >r zero-vector r> swap nappend ;
+
+: zero-pad ( n seq -- seq )
+    #! extend seq by n zeros
+    >r zero-vector r> swap append ;
+
+: zero-pad-front ( n seq -- seq )
+    >r zero-vector r> append ;
+
+: zero-extend ( n seq -- )
+    #! extend seq to max(n,length) with 0s
+    [ length ] keep -rot - swap nzero-pad ;
+
+: 2zero-extend ( seq seq -- )
+    2dup max-length [ swap zero-extend ] keep swap zero-extend ;
+
+: pextend ( p p -- p p )
+    2dup 2zero-extend ;
+
+IN: math-contrib
+
+: p= ( p p -- )
+    pextend = ;
+
+: ptrim ( p -- p )
+    dup length 1 > [ dup peek 0 = [ dup pop drop ptrim ] when ] when ;
+
+: 2ptrim ( p -- p )
+    [ ptrim ] 2apply ;
+
+: p+ ( p p -- p )
+    pextend v+ ;
+
+: p- ( p p -- p )
+    pextend v- ;
+
+: n*p ( n p -- n*p )
+    n*v ;
+
+! convolution
+: (conv*a)
+    2dup swap length - rot zero-pad-front ;
+
+: conv*a ( seq seq -- seq seq )
+    2dup 2length + 1- (conv*a) reverse -rot (conv*a) swap ;
+
+: conv*b ( seq -- seq )
+    rot dup pop drop 1 zero-vector swap append -rot ;
+
+: conv ( p p -- p )
+    conv*a [ 3dup -rot v* sum >r pick r> -rot set-nth conv*b ] repeat nip ;
+
+! polynomial multiply
+: p* ( p p -- p )
+    conv ;
+
+: p-sq ( p -- p-sq )
+    dup p* ;
+
+IN: polynomial-internals
+
+: pop-front ( seq -- seq )
+    1 swap tail ;
+
+: /-last ( seq seq -- a )
+    #! divide the last two numbers in the sequences
+    [ peek ] 2apply /i ;
+
+: p/mod-setup
+    2ptrim 2dup 2length - dup 1 < [ drop 1 ] when
+    dup >r swap zero-pad-front pextend r> 1+ ;
+
+: (p/mod)
+    2dup /-last 2dup , n*p swapd p- dup pop drop swap pop-front ;
+
+IN: math
+
+: p/mod
+    p/mod-setup [ [ (p/mod) ] times ] { } make reverse nip swap 2ptrim pextend ;
+
+: (pgcd) ( b a y x -- a d )
+    dup { 0 } clone p= [
+        drop nip
+    ] [
+        tuck p/mod >r pick p* swap >r swapd p- r> r> (pgcd)
+    ] if ;
+    
+: pgcd ( p p -- p )
+    swap { 0 } clone { 1 } clone 2swap (pgcd) ;
+