annotate README.md @ 2273:ad2e070c92e5

Weird merge error fix
author Brecht De Man <b.deman@qmul.ac.uk>
date Wed, 20 Apr 2016 19:07:03 +0200
parents 585bc3002e9d
children 21eda4b24dad
rev   line source
b@2197 1 # Web Audio Evaluation Tool
b@2197 2
b@2197 3 ## Authors
b@2197 4
b@2197 5 | Author | e-mail |
b@2197 6 | ------- | ------ |
b@2197 7 | Nicholas Jillings | <[nicholas.jillings@mail.bcu.ac.uk](nicholas.jillings@mail.bcu.ac.uk)> |
b@2197 8 | Brecht De Man | <[b.deman@qmul.ac.uk](b.deman@qmul.ac.uk)> |
b@2197 9 | David Moffat | <[d.j.moffat@qmul.ac.uk](d.j.moffat@qmul.ac.uk)>|
b@2197 10 | Joshua D. Reiss (supervisor) | <[joshua.reiss@qmul.ac.uk](joshua.reiss@qmul.ac.uk)> |
b@2197 11 | Ryan Stables (supervisor) | <[ryan.stables@bcu.ac.uk](ryan.stables@bcu.ac.uk)> |
b@2197 12
b@2197 13
b@2197 14 ## Instructions
b@2197 15
b@2197 16 Please refer to ['docs/Instructions/Instructions.pdf'](https://github.com/BrechtDeMan/WebAudioEvaluationTool/raw/master/docs/Instructions/Instructions.pdf).
b@2197 17
b@2197 18
b@2273 19 ## Dependencies
b@2273 20
b@2273 21 Runs out of the box on any web server with PHP (tested on PHP 5.1<=), no third party software needed.
b@2273 22
b@2273 23 Alternatively, a local server (no web server or internet connection needed!) and optional Python analysis scripts run on Python 2.7 or 3.x.
b@2273 24 Plots rendered using [matplotlib](http://matplotlib.org), [NumPy](http://matplotlib.org) and [SciPy](http://scipy.org).
b@2273 25
b@2273 26
b@2197 27 ## Academic use
b@2197 28
b@2207 29 ### Citing
b@2207 30
b@2198 31 Please cite
b@2198 32
b@2198 33 > Nicholas Jillings, Brecht De Man, David Moffat and Joshua D. Reiss, "[Web Audio Evaluation Tool: A Browser-Based Listening Test Environment](http://www.brechtdeman.com/publications/smc10.pdf)," [12th Sound and Music Computing Conference](http://www.maynoothuniversity.ie/smc15/), July 2015.
b@2198 34
b@2198 35 BibTeX:
b@2198 36
b@2198 37 @conference{waet2015,
b@2198 38 Author = {Jillings, Nicholas and Moffat, David and De Man, Brecht and Reiss, Joshua D.},
b@2198 39 Booktitle = {12th Sound and Music Computing Conference},
b@2198 40 Month = {July},
b@2198 41 Title = {Web {A}udio {E}valuation {T}ool: {A} browser-based listening test environment},
b@2198 42 Year = {2015}}
b@2197 43
b@2207 44 ### License
b@2207 45
b@2207 46 Please refer to LICENSE.txt ([GNU General Public License](http://www.gnu.org/licenses/gpl-3.0.en.html)).
b@2197 47
b@2273 48
b@2197 49 ## Other use
b@2197 50
b@2207 51 Other licensing schemes are available - please contact the authors regarding non-academic use.