# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1429260091 -3600
# Node ID 1e736dc124abbfd0ca13fbd0aad351f205f91d22
# Parent  89e08a7e0b6b97ce7dc55674c6c81cef16584ddf
Added in randomiseOrder function in core.js. Updated calls in ape.js to randomise order of tests and elements.

diff -r 89e08a7e0b6b -r 1e736dc124ab ape.js
--- a/ape.js	Mon Apr 13 11:46:21 2015 +0100
+++ b/ape.js	Fri Apr 17 09:41:31 2015 +0100
@@ -59,7 +59,7 @@
 	}
 	if (randomise)
 	{
- 		// TODO: Implement Randomisation!!
+ 		testXMLSetups = randomiseOrder(testXMLSetups);
 	}
 	 
 	// Obtain the metrics enabled
@@ -341,7 +341,7 @@
 		currentTrackOrder[index] = element;
 	});
 	if (randomise) {
-		// TODO: Randomise order
+		currentTrackOrder = randomiseOrder(currentTrackOrder);
 	}
 	
 	// Find all the audioElements from the audioHolder
diff -r 89e08a7e0b6b -r 1e736dc124ab core.js
--- a/core.js	Mon Apr 13 11:46:21 2015 +0100
+++ b/core.js	Fri Apr 17 09:41:31 2015 +0100
@@ -340,4 +340,22 @@
 			this.listenStart = 0;
 		}
 	};
+}
+
+function randomiseOrder(input)
+{
+	// This takes an array of information and randomises the order
+	var N = input.length;
+	var K = N;
+	var holdArr = [];
+	for (var n=0; n<N; n++)
+	{
+		// First pick a random number
+		var r = Math.random();
+		// Multiply and floor by the number of elements left
+		r = Math.floor(r*input.length);
+		// Pick out that element and delete from the array
+		holdArr.push(input.splice(r,1)[0]);
+	}
+	return holdArr;
 }
\ No newline at end of file