From e15c02f3085e7f283ff693e8e559030452b93360 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 30 Apr 2010 08:42:29 -0500 Subject: [PATCH] Clean up math.polynomials some --- basis/math/polynomials/polynomials.factor | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/basis/math/polynomials/polynomials.factor b/basis/math/polynomials/polynomials.factor index 31152016ea..57c3c5b8ef 100644 --- a/basis/math/polynomials/polynomials.factor +++ b/basis/math/polynomials/polynomials.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel make math math.order math.vectors sequences -splitting vectors macros combinators math.bits ; +USING: arrays combinators fry kernel macros make math math.bits +math.order math.vectors sequences splitting vectors ; IN: math.polynomials : 2ptrim ( p q -- p' q' ) [ ptrim ] bi@ ; : p+ ( p q -- r ) pextend v+ ; : p- ( p q -- r ) pextend v- ; -: n*p ( n p -- n*p ) n*v ; +ALIAS: n*p n*v : pextend-conv ( p q -- p' q' ) - 2dup [ length ] bi@ + 1 - 2pad-tail [ >vector ] bi@ ; + 2dup [ length ] bi@ + 1 - 2pad-tail ; : p* ( p q -- r ) - 2unempty pextend-conv dup length iota - [ over length pick pick [ * ] 2map sum ] map 2nip reverse ; + 2unempty pextend-conv + [ drop length [ iota ] keep ] + [ nip ] + [ drop ] 2tri + '[ _ _ _ v* sum ] map reverse ; -: p-sq ( p -- p^2 ) - dup p* ; +: p-sq ( p -- p^2 ) dup p* ; inline ERROR: negative-power-polynomial p n ; @@ -56,9 +58,7 @@ ERROR: negative-power-polynomial p n ; dup 1 < [ drop 1 ] when [ over length + 0 pad-head pextend ] keep 1 + ; -: /-last ( seq seq -- a ) - #! divide the last two numbers in the sequences - [ last ] bi@ / ; +: /-last ( seq1 seq2 -- x ) [ last ] bi@ / ; : (p/mod) ( p p -- p p ) 2dup /-last @@ -75,7 +75,7 @@ PRIVATE>