Refactored: 4 to 2 spaces and renamed things.

Author: Trashtalk217

contents/bubble_sort/bubble_sort.md

@@ -45,7 +45,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
 {% sample lang="php" %}
 [import:3-15, lang:"php"](code/php/bubble_sort.php)
 {% sample lang="lisp" %}
-[import:3-14, lang:"lisp"](code/lisp/bubble_sort.lisp)
+[import:3-15, lang:"lisp"](code/lisp/bubble_sort.lisp)
 {% endmethod %}
 
 ... And that's it for the simplest bubble sort method.

contents/bubble_sort/code/lisp/bubble_sort.lisp

@@ -1,18 +1,30 @@
-;;;;Bubble sort implementation
+;;;; Bubble sort implementation
 
-;;;Swaps to elements in a list (complexity: O(n))
+;;; Swaps two elements in a list (complexity: O(n))
 (defun swap (lst low high)
-    (let ((list-tail (nthcdr low lst)))
-    (rotatef (car list-tail) (elt list-tail (- high low)))
-    lst))
+  (let ((list-tail (nthcdr low lst)))
+  (rotatef (car list-tail) (elt list-tail (- high low)))
+  lst))
 
-(defun bubble_sort (lst)
-    (dotimes (m (- (length lst) 1) lst)                     ;loop
-        (dotimes (n (- (length lst) (+ 1 m)) lst)           ;loop   
-            (if (> (nth n lst) (nth (+ n 1) lst))           ;if
-            (swap lst n (+ n 1))                            ;then
-            lst))))                                         ;else
+(defun bubble-sort (lst)
+  (dotimes (m (- (length lst) 1) lst)           ;loop
+    (dotimes (n (- (length lst) (+ 1 m)) lst)   ;loop   
+      (if (> (nth n lst) (nth (+ n 1) lst))     ;if
+      (swap lst n (+ n 1))                      ;then
+      lst))))                                   ;else
 
-;;Use of an array insead of a list would be faster
-;;The built-in sort is also quicker (sort (list 5 4 3 2 1))
-(print (bubble_sort (list 5 4 3 2 1)))
+;; Use of an array instead of a list would be faster
+(print 
+  (bubble-sort (list 5 4 3 2 1)))
+(print
+  (bubble-sort (list 1 2 3 3 2 1)))
+
+;; The built-in sort is quicker, see the usage below
+;; quick test
+(assert 
+  (equal  (bubble-sort (list 5 4 3 2 1))
+          (sort '(1 2 3 4 5) #'<)))
+
+(assert 
+  (equal  (bubble-sort (list 1 2 3 3 2 1))
+          (sort '(1 2 3 3 2 1) #'<)))