X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fhanoi.lisp;h=d8ff2c86583220d3efbef3bc8856e87942cc50b2;hb=08abafbc7f0919384bf0b79a80eca958dac413fd;hp=aece2ba0d5764bd1215689e6e4e7c4b3c464ad63;hpb=1e90df9df37f8ccfe029dcf3e3dc3905779c378b;p=fw%2Faltos

diff --git a/src/test/hanoi.lisp b/src/test/hanoi.lisp
index aece2ba0..d8ff2c86 100644
--- a/src/test/hanoi.lisp
+++ b/src/test/hanoi.lisp
@@ -14,8 +14,7 @@
 ; General Public License for more details.
 ;
 
-
-; ANSI control sequences
+					; ANSI control sequences
 
 (defun move-to (col row)
   (patom "\033[" row ";" col "H" nil)
@@ -30,20 +29,17 @@
   (patom str)
   )
 
-; Here's the pieces to display
+					; Here's the pieces to display
 
-(setq stack '("*" "**" "***" "****" "*****" "******" "*******"))
+(setq stack '("     *     " "    ***    " "   *****   " "  *******  " " ********* " "***********"))
 
-(setq top (+ (length stack) 3))
+					; Here's all of the stacks of pieces
+					; This is generated when the program is run
 
-;
-; Here's all of the stacks of pieces
-; This is generated when the program is run
-;
 (setq stacks nil)
 
-; Display one stack, clearing any
-; space above it
+					; Display one stack, clearing any
+					; space above it
 
 (defun display-stack (x y clear stack)
   (cond ((= 0 clear)
@@ -55,21 +51,21 @@
 	       )
 	 )
 	(t (progn
-	     (display-string x y "          ")
+	     (display-string x y "                    ")
 	     (display-stack x (1+ y) (1- clear) stack)
 	     )
 	   )
 	)
   )
 
-; Position of the top of the stack on the screen
-; Shorter stacks start further down the screen
+					; Position of the top of the stack on the screen
+					; Shorter stacks start further down the screen
 
 (defun stack-pos (y stack)
   (- y (length stack))
   )
 
-; Display all of the stacks, spaced 20 columns apart
+					; Display all of the stacks, spaced 20 columns apart
 
 (defun display-stacks (x y stacks)
   (cond (stacks (progn
@@ -79,8 +75,8 @@
 	)
   )
 
-; Display all of the stacks, then move the cursor
-; out of the way and flush the output
+					; Display all of the stacks, then move the cursor
+					; out of the way and flush the output
 
 (defun display ()
   (display-stacks 0 top stacks)
@@ -88,17 +84,18 @@
   (flush)
   )
 
-; Reset stacks to the starting state, with
-; all of the pieces in the first stack and the
-; other two empty
+					; Reset stacks to the starting state, with
+					; all of the pieces in the first stack and the
+					; other two empty
 
 (defun reset-stacks ()
   (setq stacks (list stack nil nil))
+  (setq top (+ (length stack) 3))
   (length stack)
   )
 
-; more functions which could usefully
-; be in the rom image
+					; more functions which could usefully
+					; be in the rom image
 
 (defun min (a b)
   (cond ((< a b) a)
@@ -106,8 +103,8 @@
 	)
   )
 
-; Replace a stack in the list of stacks
-; with a new value
+					; Replace a stack in the list of stacks
+					; with a new value
 
 (defun replace (list pos member)
   (cond ((= pos 0) (cons member (cdr list)))
@@ -115,8 +112,8 @@
 	)
   )
 
-; Move a piece from the top of one stack
-; to the top of another
+					; Move a piece from the top of one stack
+					; to the top of another
 
 (defun move-piece (from to)
   (let ((from-stack (nth stacks from))
@@ -149,13 +146,25 @@
 	)
   )
 
-; A pretty interface which
-; resets the state of the game,
-; clears the screen and runs
-; the program
+					; A pretty interface which
+					; resets the state of the game,
+					; clears the screen and runs
+					; the program
 
 (defun hanoi ()
   (setq len (reset-stacks))
   (clear)
   (_hanoi len 0 1 2)
+  )
+
+					; Run many in a row to time them
+
+(defun hanois(n)
+  (cond ((> n 0)
+	 (progn
+	   (hanoi)
+	   (hanois (1- n))
+	   )
+	 )
+	)
   )