# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1449577338 0
# Node ID c3c3e6820b2f77775b144a5afd641032649e4076
# Parent  3359408db7aac4e03d0c2484269c1b78070273d9# Parent  568829c2b4a0fa0e7b6a0bf17380ca7fb5b1d583
Merge

diff -r 568829c2b4a0 -r c3c3e6820b2f example_eval/project.xml
--- a/example_eval/project.xml	Tue Dec 08 12:01:48 2015 +0000
+++ b/example_eval/project.xml	Tue Dec 08 12:22:18 2015 +0000
@@ -2,28 +2,20 @@
 <BrowserEvalProjectDocument>
 	<setup interface="APE" projectReturn="save.php" randomiseOrder='false' collectMetrics='true' testPages="2">
 		<PreTest>
-			<question id="Location" mandatory="true" boxsize="large">Please enter your location.</question>
-			<checkbox id="experience">
-				<statement>Check options which are relevant to you</statement>
-				<option id="digital">Digital Consoles</option>
-				<option id="analog">Analog Consoles</option>
-				<option id="live">Live Mixing</option>
-				<option id="studio">Studio Mixing</option>
-				<option id="player">Play an instrument</option>
-			</checkbox>
-			<number id="age" min="0">Please enter your age</number>
-			<statement>Please listen to all fragments</statement>
+			<question id="sessionId" mandatory="true">Please enter your name.</question>
+			<statement>This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
 		</PreTest>
 		<PostTest>
-			<question id="SessionID" mandatory="true">Please enter your name.</question>
+			<question id="location" mandatory="true" boxsize="large">Please enter your location. (example mandatory text question)</question>
+			<number id="age" min="0">Please enter your age (example non-mandatory number question)</number>
 			<radio id="rating">
-				<statement>Please rate this interface</statement>
+				<statement>Please rate this interface (example radio button question)</statement>
 				<option name="bad">Bad</option>
-				<option name="OK">OK</option>
-				<option name="Good">Good</option>
-				<option name="Great">Great</option>
+				<option name="poor">Poor</option>
+				<option name="good">Good</option>
+				<option name="great">Great</option>
 			</radio>
-			<statement>Thank you for taking this listening test.</statement>
+			<statement>Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder.</statement>
 		</PostTest>
 		<Metric>
 			<metricEnable>testTimer</metricEnable>
@@ -41,7 +33,7 @@
 			<option name="page-count"/>
 		</interface>
 	</setup>
-	<audioHolder id='test-0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='true' elementComments='true'>
+	<audioHolder id='test-0' hostURL="example_eval/" randomiseOrder='true' repeatCount='0' loop='true' elementComments='true'>
 		<interface name="preference">
 			<title>Preference</title>
 			<scale position="0">Min</scale>
@@ -62,29 +54,14 @@
 		<audioElements url="2.wav" id="2"/>
 		<audioElements url="3.wav" id="3"/>
 		<audioElements url="4.wav" id="4"/>
-		<CommentQuestion id='mixingExperience' type="text">What is your mixing experience</CommentQuestion>
-		<CommentQuestion id="preference" type="radio">
-			<statement>Please enter your ranking preference on this song</statement>
-			<option name="worst">Very Bad</option>
-			<option name="bad"></option>
-			<option name="OK">OK</option>
-			<option name="Good"></option>
-			<option name="Great">Great</option>
-		</CommentQuestion>
-		<CommentQuestion id="preference" type="checkbox">
-			<statement>Describe this song</statement>
-			<option name="bright">Bright</option>
-			<option name="punchy">Punchy</option>
-			<option name="dark">Dark</option>
-			<option name="muddy">Muddy</option>
-			<option name="thin">Thin</option>
-		</CommentQuestion>
-		<PreTest/>
+		<PreTest>
+			<statement>Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. </statement>
+		</PreTest>
 		<PostTest>
 			<question id="genre" mandatory="true">Please enter the genre.</question>
 		</PostTest>
 	</audioHolder>
-    <audioHolder id='test-1' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='false' elementComments='true'>
+    <audioHolder id='test-1' hostURL="example_eval/" randomiseOrder='true' repeatCount='0' loop='false' elementComments='true'>
         <interface>
             <title>Example Test Question</title>
             <scale position="0">Min</scale>
@@ -94,16 +71,16 @@
             <scalerange min="25" max="75"/>
             <commentBoxPrefix>Comment on fragment</commentBoxPrefix>
         </interface>
-        <audioElements url="0.wav" id="0" type="reference" marker="80"/>
-        <audioElements url="1.wav" id="1" type="anchor" marker="20"/>
+        <audioElements url="0.wav" id="0" type="anchor" marker="20"/>
+        <audioElements url="1.wav" id="1" type="reference" marker="80"/>
         <audioElements url="2.wav" id="2"/>
         <audioElements url="3.wav" id="3"/>
         <audioElements url="4.wav" id="4"/>
         <audioElements url="5.wav" id="5"/>
         <audioElements url="6.wav" id="6" type="outsidereference"/>
-        <CommentQuestion id='mixingExperience' type="text">What is your mixing experience?</CommentQuestion>
+        <CommentQuestion id='mixingExperience' type="text">What is your general experience with numbers?</CommentQuestion>
         <CommentQuestion id="preference" type="radio">
-            <statement>Please enter your ranking preference on this song.</statement>
+            <statement>Please enter your overall preference</statement>
             <option name="worst">Very Bad</option>
             <option name="bad"></option>
             <option name="OK">OK</option>
@@ -111,13 +88,15 @@
             <option name="Great">Great</option>
         </CommentQuestion>
         <CommentQuestion id="preference" type="checkbox">
-            <statement>Describe this song</statement>
+            <statement>Please describe the overall character</statement>
             <option name="funky">Funky</option>
             <option name="mellow">Mellow</option>
             <option name="laidback">Laid back</option>
             <option name="heavy">Heavy</option>
         </CommentQuestion>
-        <PreTest/>
+        <PreTest>
+        	<statement>Example of an 'APE' style interface with outside reference 'six', hidden anchor 'zero' (which needs to be below 20%), hidden reference 'one' (which needs to be above 80%), randomisation of marker labels, and a forced scale usage of at least 25%-75%. </statement>
+        </PreTest>
         <PostTest>
             <question id="genre" mandatory="true">Please enter the genre.</question>
         </PostTest>