[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: 5x5 again
From: |
Vincent Belaïche |
Subject: |
Re: 5x5 again |
Date: |
Sat, 28 May 2011 08:05:56 +0200 |
[...]
>> If I do this, I would also add a function to browse through the other
>> solutions found by the solver --- only the one with least Hamming
>> weight being shown.
>
>Then please do and include the above fix in this new patch.
>
>
> Stefan
>
Salut Stéfan,
Here is the ChangeLog:
-----------------------------------------------------------------------
2011-05-28 Vincent Belaïche <address@hidden>
* play/5x5.el (5x5-solve-rotate-left, 5x5-solve-rotate-right): New
functions.
(5x5-mode-map): Add keys for 5x5-solve-rotate-left &
5x5-solve-rotate-right.
(5x5-mode-menu): Add menu entries for 5x5-solve-rotate-left &
5x5-solve-rotate-right and make solver a separate section.
(5x5): Update docstring for showing keymap for 5x5-solve-suggest,
5x5-solve-rotate-left & 5x5-solve-rotate-right.
(5x5-draw-grid): Use "()" instead of "O" to display solution when
the x scale is even, as this is better looking.
-----------------------------------------------------------------------
And here is the patch (it seems that my change of 2011-05-24 has not
been applied, so this patch is relative to the previous one):
=== modified file 'lisp/play/5x5.el'
--- lisp/play/5x5.el 2011-05-23 14:46:41 +0000
+++ lisp/play/5x5.el 2011-05-28 05:59:59 +0000
@@ -144,6 +144,8 @@
(define-key map [(control c) (control x)] #'5x5-crack-xor-mutate)
(define-key map "n" #'5x5-new-game)
(define-key map "s" #'5x5-solve-suggest)
+ (define-key map "<" #'5x5-solve-rotate-left)
+ (define-key map ">" #'5x5-solve-rotate-right)
(define-key map "q" #'5x5-quit-game)
map)
"Local keymap for the 5x5 game.")
@@ -174,6 +176,9 @@
["Quit game" 5x5-quit-game t]
"---"
["Use Calc solver" 5x5-solve-suggest t]
+ ["Rotate left list of Calc solutions" 5x5-solve-rotate-left t]
+ ["Rotate right list of Calc solutions" 5x5-solve-rotate-right t]
+ "---"
["Crack randomly" 5x5-crack-randomly t]
["Crack mutating current" 5x5-crack-mutating-current t]
["Crack mutating best" 5x5-crack-mutating-best t]
@@ -207,18 +212,21 @@
5x5 keyboard bindings are:
\\<5x5-mode-map>
-Flip \\[5x5-flip-current]
-Move up \\[5x5-up]
-Move down \\[5x5-down]
-Move left \\[5x5-left]
-Move right \\[5x5-right]
-Start new game \\[5x5-new-game]
-New game with random grid \\[5x5-randomize]
-Random cracker \\[5x5-crack-randomly]
-Mutate current cracker \\[5x5-crack-mutating-current]
-Mutate best cracker \\[5x5-crack-mutating-best]
-Mutate xor cracker \\[5x5-crack-xor-mutate]
-Quit current game \\[5x5-quit-game]"
+Flip \\[5x5-flip-current]
+Move up \\[5x5-up]
+Move down \\[5x5-down]
+Move left \\[5x5-left]
+Move right \\[5x5-right]
+Start new game \\[5x5-new-game]
+New game with random grid \\[5x5-randomize]
+Random cracker \\[5x5-crack-randomly]
+Mutate current cracker \\[5x5-crack-mutating-current]
+Mutate best cracker \\[5x5-crack-mutating-best]
+Mutate xor cracker \\[5x5-crack-xor-mutate]
+Solve with Calc \\[5x5-solve-suggest]
+Rotate left Calc Solutions \\[5x5-solve-rotate-left]
+Rotate right Calc Solutions \\[5x5-solve-rotate-right]
+Quit current game \\[5x5-quit-game]"
(interactive "P")
(setq 5x5-cracking nil)
@@ -239,7 +247,8 @@
(setq 5x5-x-pos (/ 5x5-grid-size 2)
5x5-y-pos (/ 5x5-grid-size 2)
5x5-moves 0
- 5x5-grid (5x5-make-move (5x5-make-new-grid) 5x5-y-pos 5x5-x-pos))
+ 5x5-grid (5x5-make-move (5x5-make-new-grid) 5x5-y-pos 5x5-x-pos)
+ 5x5-solver-output nil)
(5x5-draw-grid (list 5x5-grid))
(5x5-position-cursor)))
@@ -330,9 +339,14 @@
(forward-char (+ 1 (/ (1+ 5x5-x-scale) 2)))
(dotimes (x 5x5-grid-size)
(when (5x5-cell solution-grid y x)
+ (if (= 0 (mod 5x5-x-scale 2))
+ (progn
+ (insert "()")
+ (delete-region (point) (+ (point) 2))
+ (backward-char 2))
(insert-char ?O 1)
(delete-char 1)
- (backward-char))
+ (backward-char)))
(forward-char (1+ 5x5-x-scale))))
(forward-line 5x5-y-scale))))
(setq 5x5-solver-output nil)))
@@ -515,8 +529,8 @@
(with-current-buffer 5x5-log-buffer
(insert name ?= value-to-log ?\n))))
value))
- (defmacro 5x5-log-init ())
- (defmacro 5x5-log (name value) value))
+ (defsubst 5x5-log-init ())
+ (defsubst 5x5-log (name value) value))
(defun 5x5-solver (grid)
"Return a list of solutions for GRID.
@@ -768,6 +782,49 @@
(5x5-draw-grid (list 5x5-grid))
(5x5-position-cursor))
+(defun 5x5-solve-rotate-left (&optional n)
+ "Rotate left by N the list of solutions in 5x5-solver-output.
+If N is not supplied, rotate by 1."
+ (interactive "P")
+ (let ((len (length 5x5-solver-output)))
+ (when (>= len 3)
+ (setq n (if (integerp n) n 1)
+ n (mod n (1- len)))
+ (unless (eq n 0)
+ (setq n (- len n 1))
+ (let* ((p-tail (last 5x5-solver-output (1+ n)))
+ (tail (cdr p-tail))
+ (l-tail (last tail)))
+ ;;
+ ;; For n = 2:
+ ;;
+ ;; +--+--+ +--+--+ +--+--+ +--+--+ +--+--+
+ ;; |M | ---->|S1| ---->|S2| ---->|S3| ---->|S4| ----> nil
+ ;; +--+--+ +--+--+ +--+--+ +--+--+ +--+--+
+ ;; ^ ^ ^ ^
+ ;; | | | |
+ ;; + 5x5-solver-output | | + l-tail
+ ;; + p-tail |
+ ;; + tail
+ ;;
+ (setcdr l-tail (cdr 5x5-solver-output))
+ (setcdr 5x5-solver-output tail)
+ (unless (eq p-tail 5x5-solver-output)
+ (setcdr p-tail nil)))
+ (5x5-draw-grid (list 5x5-grid))
+ (5x5-position-cursor)))))
+
+(defun 5x5-solve-rotate-right (&optional n)
+ "Rotate right by N the list of solutions in 5x5-solver-output.
+If N is not supplied, rotate by 1."
+ (interactive "P")
+ (setq n
+ (if (integerp n) (- n)
+ -1))
+ (5x5-solve-rotate-left n))
+
+
+
;; Keyboard response functions.
(defun 5x5-flip-current ()
@@ -843,7 +900,8 @@
(setq 5x5-x-pos (/ 5x5-grid-size 2)
5x5-y-pos (/ 5x5-grid-size 2)
5x5-moves 0
- 5x5-grid (5x5-make-random-grid (symbol-function '5x5-make-move)))
+ 5x5-grid (5x5-make-random-grid (symbol-function '5x5-make-move))
+ 5x5-solver-output nil)
(unless 5x5-cracking
(5x5-draw-grid (list 5x5-grid)))
(5x5-position-cursor)))
- 5x5 again, Vincent Belaïche, 2011/05/24
- Re: 5x5 again,
Vincent Belaïche <=
- Re: 5x5 again, Vincent Belaïche, 2011/05/31