factor: trim using lists

[factor.git] / extra / math / runge-kutta / runge-kutta.factor

diff --git a/extra/math/runge-kutta/runge-kutta.factor b/extra/math/runge-kutta/runge-kutta.factor
index 77b0cda6dcbf9b4d4de929bd84b924a037e1c9ab..8ed6c25777c20846969f5ffd134ec0415548e543 100755 (executable)
--- a/extra/math/runge-kutta/runge-kutta.factor
+++ b/extra/math/runge-kutta/runge-kutta.factor
@@ -1,5 +1,5 @@
-USING: kernel accessors fry combinators sequences sequences.generalizations
-       arrays math math.vectors math.functions ;
+USING: kernel accessors combinators sequences sequences.generalizations
+arrays math math.vectors ;
 IN: math.runge-kutta
 
 : runge-kutta-2-transform ( rk1 tx..n delta -- tx..n' delta )
@@ -9,17 +9,17 @@ IN: math.runge-kutta
     runge-kutta-2-transform ;
 
 : runge-kutta-4-transform ( rk3 tx..n delta -- tx..n' delta )
-    [ [ swap ] dip [ v*n ] keep prefix v+ ] keep ;
+    [ swapd [ v*n ] keep prefix v+ ] keep ;
 
 : (runge-kutta) ( delta tx..n dx..n/dt -- rk )
-    [ swap ] dip dup length>> [ cleave ] dip narray swap v*n
+    swapd dup length>> [ cleave ] dip narray swap v*n
     ; inline
 
 : runge-kutta-differentials ( dx..n/dt -- seq )
     '[ _ (runge-kutta) ] ;
 
 : runge-kutta-transforms ( tx..n delta dx..n/dt -- seq )
-    -rot swap
+    spin
     [ { [ ]
       [ runge-kutta-2-transform ]
       [ runge-kutta-3-transform ]
@@ -48,7 +48,7 @@ IN: math.runge-kutta
         call( -- rk1 rk2 rk3 rk4 rk4 ) drop 4array 
 
         ! make array of zeroes of appropriate length to reduce into
-        dup first length>> 0 <repetition> >array
+        dup first length>> 0 <array>
 
         ! reduce the results to the estimated change for the timestep
         [ v+ ] reduce