Mercurial > hg > webaudioevaluationtool
comparison ape.js @ 678:1e736dc124ab
Added in randomiseOrder function in core.js. Updated calls in ape.js to randomise order of tests and elements.
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Fri, 17 Apr 2015 09:41:31 +0100 |
| parents | e604ee22185b |
| children | a79490e0fdc7 |
comparison
equal
deleted
inserted
replaced
| 677:89e08a7e0b6b | 678:1e736dc124ab |
|---|---|
| 57 } else { | 57 } else { |
| 58 randomise = false; | 58 randomise = false; |
| 59 } | 59 } |
| 60 if (randomise) | 60 if (randomise) |
| 61 { | 61 { |
| 62 // TODO: Implement Randomisation!! | 62 testXMLSetups = randomiseOrder(testXMLSetups); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // Obtain the metrics enabled | 65 // Obtain the metrics enabled |
| 66 var metricNode = xmlSetup.find('Metric'); | 66 var metricNode = xmlSetup.find('Metric'); |
| 67 var metricNode = metricNode.find('metricEnable'); | 67 var metricNode = metricNode.find('metricEnable'); |
| 339 // Find any blind-repeats | 339 // Find any blind-repeats |
| 340 // Not implemented yet, but just incase | 340 // Not implemented yet, but just incase |
| 341 currentTrackOrder[index] = element; | 341 currentTrackOrder[index] = element; |
| 342 }); | 342 }); |
| 343 if (randomise) { | 343 if (randomise) { |
| 344 // TODO: Randomise order | 344 currentTrackOrder = randomiseOrder(currentTrackOrder); |
| 345 } | 345 } |
| 346 | 346 |
| 347 // Find all the audioElements from the audioHolder | 347 // Find all the audioElements from the audioHolder |
| 348 $(currentTrackOrder).each(function(index,element){ | 348 $(currentTrackOrder).each(function(index,element){ |
| 349 // Find URL of track | 349 // Find URL of track |