loic/remote-snake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change array to list: simple and faster

Browse source
This commit is contained in:
Loic Guegan 2019-05-08 18:59:45 +02:00
parent 614c7a6278
commit 3c42acfdd9
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
server/game.lisp
View file

@ -16,23 +16,23 @@
:initarg :grid-size :initarg :grid-size
:initform (list 30 30)) :initform (list 30 30))
(food (food
:initform (make-array 0)))) :initform (make-list 0))))
;;; Class constructor to initialize the snake ;;; Class constructor to initialize the snake
(defmethod initialize-instance :after ((g game) &key) (defmethod initialize-instance :after ((g game) &key)
(with-slots (snake initial-size initial-position) g (with-slots (snake initial-size initial-position) g
(setf snake (make-array initial-size :initial-element initial-position)))) (setf snake (make-list initial-size :initial-element initial-position))))
;;; Pretty-print a game ;;; Pretty-print a game
(defmethod print-object ((g game) stream) (defmethod print-object ((g game) stream)
(with-slots (snake dir food) g (with-slots (snake dir food) g
(format t "Snake: ") (format t "Snake: ")
(dotimes (i (first (array-dimensions snake))) (dotimes (i (length snake))
(let ((elem (aref snake i))) (let ((elem (nth i snake)))
(unless (eql i 0) (unless (eql i 0)
(format t "<=")) (format t "<="))
(format t "(~a,~a)" (first elem) (second elem)))) (format t "(~a,~a)" (first elem) (second elem))))
(format t "~%Size: ~a" (first (array-dimensions snake))) (format t "~%Size: ~a" (length snake))
(format t "~%Direction: ~a" dir) (format t "~%Direction: ~a" dir)
(format t "~%Food: ~a" food))) (format t "~%Food: ~a" food)))
@ -54,11 +54,11 @@
;;; Grow snake of grow-size amount (snake is growing by the tail) ;;; Grow snake of grow-size amount (snake is growing by the tail)
(defun grow-snake (snake grow-size) (defun grow-snake (snake grow-size)
(let* ((old-size (first (array-dimensions snake))) (let* ((old-size (length snake))
(new-size (+ old-size grow-size)) (new-size (+ old-size grow-size))
(tail (aref snake (- old-size 1))) (tail (nth (- old-size 1) snake))
(new-tail (coerce (make-array grow-size :initial-element tail) 'list)) (new-tail (make-list grow-size :initial-element tail))
(new-snake (make-array new-size :initial-contents `(,@(coerce snake 'list) ,@new-tail)))) (new-snake (coerce (make-array new-size :initial-contents `(,@snake ,@new-tail)) 'list)))
new-snake)) new-snake))
@ -75,8 +75,8 @@
;; Then, move the snake ;; Then, move the snake
(with-slots (snake dir) g (with-slots (snake dir) g
(let ((last-old-x nil) (last-old-y nil)) (let ((last-old-x nil) (last-old-y nil))
(dotimes (i (first (array-dimensions snake))) (dotimes (i (length snake))
(let ((elem (aref snake i))) (let ((elem (nth i snake)))
(let ((x (first elem)) (y (second elem))) (let ((x (first elem)) (y (second elem)))
;; Move snake ;; Move snake
(if (eql i 0) ; Move head (if (eql i 0) ; Move head
@ -92,7 +92,7 @@
(rotatef x last-old-x) (rotatef x last-old-x)
(rotatef y last-old-y))) (rotatef y last-old-y)))
(format t "l:(~a,~a) n:(~a,~a) ~%" last-old-x last-old-y x y) (format t "l:(~a,~a) n:(~a,~a) ~%" last-old-x last-old-y x y)
(setf (aref snake i) (list x y))))))) ; Apply new snake location (update snake slot) (setf (nth i snake) (list x y))))))) ; Apply new snake location (update snake slot)
;; Check if we loose ;; Check if we loose
) )
@ -107,13 +107,10 @@
(defmethod add-food ((g game) nb) (defmethod add-food ((g game) nb)
(with-slots (snake grid-size food) g (with-slots (snake grid-size food) g
(let ((snake-list (coerce snake 'list)) ; To be able to use the function member later (let ((size-x (first grid-size))
(food-list (coerce food 'list)) (size-y (second grid-size)))
(size-x (first grid-size))
(size-y (second grid-size))
(food-size (first (array-dimensions food))))
(dotimes (i nb) (dotimes (i nb)
(let ((x (random size-x)) (let ((x (random size-x))
(y (random size-y))) (y (random size-y)))
(when (eq (member (list x y) snake-list :test #'equal-coord) nil) ; Add if there is no conflict between snake and food position (when (eq (member (list x y) snake :test #'equal-coord) nil) ; Add if there is no conflict between snake and food position
(setf food (make-array (1+ food-size) :initial-contents `(,@food-list ,(list x y)))))))))) (setf food (coerce (make-array (1+ (length food)) :initial-contents `(,@food ,(list x y))) 'list))))))))