X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=examples%2Fmandelbrot.4th;h=5707acb5ff15b719efe5f422ba4d8a7c51e23d26;hb=8da6476a6cfd583220ad70d1f8360ae404ea1c6f;hp=55f746eec222d3eaaea9fd8749e3add6e86be489;hpb=91c9ee133605d4d8871b897b109a60f401b3aa79;p=forth.jl.git

diff --git a/examples/mandelbrot.4th b/examples/mandelbrot.4th
index 55f746e..5707acb 100644
--- a/examples/mandelbrot.4th
+++ b/examples/mandelbrot.4th
@@ -17,43 +17,52 @@
 : * precision */ ;
 
 : c* ( x1 y1 x2 y2 -- x3 y3 )
-        swap -rot               ( x1 x2 y1 y2 )
-        2dup * negate           ( x1 x2 y1 y2 -y1y2 )
-        4 pick 4 pick * +       ( x1 x2 y1 y2 (x1x2-y1y2))
-        4 roll 2 roll *         ( x2 y1 (x1x2-y1y2) x1y2 )
-        3 roll 3 roll * +       ( (x1x2-y1y2) (x1y2+x2y1) )
+    swap -rot               ( x1 x2 y1 y2 )
+    2dup * negate           ( x1 x2 y1 y2 -y1y2 )
+    4 pick 4 pick * +       ( x1 x2 y1 y2 (x1x2-y1y2))
+    4 roll 2 roll *         ( x2 y1 (x1x2-y1y2) x1y2 )
+    3 roll 3 roll * +       ( (x1x2-y1y2) (x1y2+x2y1) )
 ;
 
 : c+ ( x1 y1 x2 y2 -- x3 y3 )
-        rot +
-        -rot +
-        swap
+    rot +
+    -rot +
+    swap
 ;
 
 : csq 2dup c* ;
 
 : cmagsq ( x1 y1 -- mag )
-        csq abs
+    csq abs
 ;
 
 ( --- Mandelbrot set calculations  --- )
 
 : iterate ( cr ci zr zi -- cr ci z'r z'i )
-        csq c+
+    csq c+
 ;
 
 : inSet? ( cr ci -- res )
+    DEBUGON
+
+    0 0     ( z_0 = 0 )
     
+    true    ( flag indicating set membership )
     100 0 do
+        drop
 
-        2swap 2dup 5 roll 5 roll
         iterate
         2dup cmagsq
-        100 > if
+        4 >scaled > if
+            false ( not in set )
             leave
         then
 
+        true ( maybe in set )
     loop
+
+    ( Clear z and c, leaving set membership flag ) 
+    -rot 2drop -rot 2drop
 ;
 
 : xsteps 100 ;