Merge pull request kennyledet#104 from Yonaba/master

jcla1 · jcla1 · commit b2e88adeb817 · 2014-01-01T14:38:11.000-08:00
Bit of cleanup and Shellsort
diff --git a/Selection_Sort/Lua/Yonaba/selection_sort_test.lua b/Selection_Sort/Lua/Yonaba/selection_sort_test.lua
@@ -41,7 +41,6 @@ math.randomseed(os.time())
 
 run('Empty arrays', function()
 	local t = {}
-	print(is_sorted(selection_sort({})))
 	assert(is_sorted(selection_sort({})))
 end)
 
diff --git a/Shell_Sort/Lua/Yonaba/shell_sort.lua b/Shell_Sort/Lua/Yonaba/shell_sort.lua
@@ -0,0 +1,23 @@
+-- Shell sort algorithm
+-- See: http://en.wikipedia.org/wiki/Shellsort
+
+-- list: a list to be sorted, in-place
+-- comp: (optional) a comparison function
+--  defaults to function(a, b) return a < b end
+-- returns: the passed-in list, sorted
+return function (list, comp)
+	comp = comp or function(a, b) return a < b end
+	local n = #list
+	for gap = 1, n do
+		for i = gap, n do
+			local tmp = list[i]
+			local j = i
+			while j > gap and comp(tmp, list[j-gap]) do
+				list[j] = list[j-gap]
+				j = j - gap
+			end
+			list[j] = tmp
+		end
+	end
+	return list
+end
diff --git a/Shell_Sort/Lua/Yonaba/shell_sort_test.lua b/Shell_Sort/Lua/Yonaba/shell_sort_test.lua
@@ -0,0 +1,60 @@
+-- Tests for shell_sort.lua
+local shell_sort = require 'shell_sort'
+
+local total, pass = 0, 0
+
+local function dec(str, len)
+	return #str < len
+	   and str .. (('.'):rep(len-#str))
+		  or str:sub(1,len)
+end
+
+local function run(message, f)
+	total = total + 1
+	local ok, err = pcall(f)
+	if ok then pass = pass + 1 end
+	local status = ok and 'PASSED' or 'FAILED'
+	print(('%02d. %68s: %s'):format(total, dec(message,68), status))
+end
+
+-- Comparison functions
+local function le(a,b) return a <= b end
+local function ge(a,b) return a >= b end
+
+-- Checks if list is sorted
+function is_sorted(list, comp)
+	comp = comp or le
+	for i = 2, #list do
+		if not comp(list[i-1],list[i]) then return false end
+	end
+	return true
+end
+
+-- Generates a table of n random values
+local function gen(n)
+	local t = {}
+	for i = 1, n do t[i] = math.random(n) end
+	return t
+end
+
+math.randomseed(os.time())
+
+run('Empty arrays', function()
+	local t = {}
+	assert(is_sorted(shell_sort({})))
+end)
+
+run('Already sorted array', function()
+	local t = {1, 2, 3, 4, 5}
+	assert(is_sorted(shell_sort(t)))
+end)
+
+run('Sorting a large array (1e3 values)', function()
+	local t = gen(1e3)
+	assert(is_sorted(shell_sort(t)))
+	assert(is_sorted(shell_sort(t, ge), ge))
+end)
+
+print(('-'):rep(80))
+print(('Total : %02d: Pass: %02d - Failed : %02d - Success: %.2f %%')
+	:format(total, pass, total-pass, (pass*100/total)))
