From d6cb2d63f49b9b1bae15e0b9f8ce5719b8f37921 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 6 Nov 2009 14:52:53 -0600 Subject: [PATCH] remove dead jamshred code --- extra/jamshred/tunnel/tunnel-tests.factor | 13 ----------- extra/jamshred/tunnel/tunnel.factor | 27 ----------------------- 2 files changed, 40 deletions(-) diff --git a/extra/jamshred/tunnel/tunnel-tests.factor b/extra/jamshred/tunnel/tunnel-tests.factor index e2e1c20122..ac696f5444 100644 --- a/extra/jamshred/tunnel/tunnel-tests.factor +++ b/extra/jamshred/tunnel/tunnel-tests.factor @@ -6,19 +6,6 @@ alien.c-types ; SPECIALIZED-ARRAY: float IN: jamshred.tunnel.tests -[ 0 ] [ T{ segment f { 0 0 0 } f f f 0 } - T{ segment f { 1 1 1 } f f f 1 } - T{ oint f { 0 0 0.25 } } - nearer-segment number>> ] unit-test - -[ 0 ] [ T{ oint f { 0 0 0 } } find-nearest-segment number>> ] unit-test -[ 1 ] [ T{ oint f { 0 0 -1 } } find-nearest-segment number>> ] unit-test -[ 2 ] [ T{ oint f { 0 0.1 -2.1 } } find-nearest-segment number>> ] unit-test - -[ 3 ] [ T{ oint f { 0 0 -3.25 } } 0 nearest-segment-forward number>> ] unit-test - -[ float-array{ 0 0 0 } ] [ T{ oint f { 0 0 -0.25 } } over first nearest-segment location>> ] unit-test - : test-segment-oint ( -- oint ) { 0 0 0 } { 0 0 -1 } { 0 1 0 } { -1 0 0 } ; diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor index 7f8646b778..f94fc979ce 100644 --- a/extra/jamshred/tunnel/tunnel.factor +++ b/extra/jamshred/tunnel/tunnel.factor @@ -63,33 +63,6 @@ CONSTANT: default-segment-radius 1 #! valid values [ '[ _ clamp-length ] bi@ ] keep ; -:: nearer-segment ( seg-a seg-b oint -- segment ) - seg-a oint distance - seg-b oint distance < - seg-a seg-b ? ; - -: (find-nearest-segment) ( nearest next oint -- nearest ? ) - #! find the nearest of 'next' and 'nearest' to 'oint', and return - #! t if the nearest hasn't changed - pick [ nearer-segment dup ] dip = ; - -: find-nearest-segment ( oint segments -- segment ) - dup first swap rest-slice rot [ (find-nearest-segment) ] curry - find 2drop ; - -: nearest-segment-forward ( segments oint start -- segment ) - rot tail-slice find-nearest-segment ; - -: nearest-segment-backward ( segments oint start -- segment ) - 1 + rot head-slice find-nearest-segment ; - -: nearest-segment ( segments oint start-segment -- segment ) - #! find the segment nearest to 'oint', and return it. - #! start looking at segment 'start-segment' - number>> over [ - [ nearest-segment-forward ] 3keep nearest-segment-backward - ] dip nearer-segment ; - : get-segment ( segments n -- segment ) over clamp-length swap nth ; -- 2.34.1