Mercurial > hg > nnls-chroma
changeset 177:6bfce96d87b4
Use ogg file as regression input
| author | Chris Cannam |
|---|---|
| date | Wed, 04 Nov 2015 15:09:33 +0000 |
| parents | 259ef0f4622b |
| children | ba78ca8cb956 |
| files | regression/expected.csv regression/regression.sh |
| diffstat | 2 files changed, 150 insertions(+), 157 deletions(-) [+] |
line wrap: on
line diff
--- a/regression/expected.csv Mon Nov 02 15:18:39 2015 +0000 +++ b/regression/expected.csv Wed Nov 04 15:09:33 2015 +0000 @@ -1,161 +1,154 @@ 0.000000000,"N" 0.046439909,"Ab" -1.671836734,"Bm6" -2.972154195,"Cm" -4.411791383,"C#" -7.523265306,"Cm" -8.173424036,"D7" -8.823582766,"Gaug" -10.123900226,"Cm" -11.006258503,"F7" -11.377777777,"G" -15.836009070,"D7/F#" -17.229206349,"Cm7" -19.504761904,"Fm7" -20.619319727,"Ddim" -20.944399092,"Cm" -23.173514739,"Fm7" -25.077551020,"Cm" -26.563628117,"G" -28.467664399,"Cm" +1.625396825,"Bm6" +2.925714285,"Cm" +4.318911564,"C#" +7.476825396,"Cm" +8.126984126,"D7" +8.777142857,"Gaug" +10.077460317,"Cm" +10.959818594,"F7" +11.331337868,"G" +15.789569160,"D7/F#" +17.182766439,"Cm7" +19.458321995,"Fm" +20.108480725,"Ab" +20.572879818,"Dm" +20.851519274,"Cm" +23.127074829,"Fm7" +25.031111111,"Cm" +26.517188208,"G" +27.445986394,"B" +27.910385487,"Gmaj7" +28.421224489,"Cm" 29.442902494,"F7" -29.814421768,"Gmaj7" -31.997097505,"Eb6" -33.901133786,"Fm7" -36.037369614,"Cm7" -37.894965986,"Fm7" -39.752562358,"Cm" -41.145759637,"G" -42.956916099,"Cm" -43.885714285,"F7" -44.303673469,"G7" -44.721632653,"D7" -45.603990929,"G7" -46.347029478,"Cm7" -48.622585034,"Fm7" -49.644263038,"D" -49.922902494,"Cm" -52.059138321,"Fm" -53.730975056,"Cm" -54.613333333,"F6" -55.913650793,"G" -57.121088435,"Cm" -58.653605442,"G" -61.068480725,"Cm7" -62.926077097,"Fm7" -63.994195011,"Ddim" -64.412154195,"Eb" -65.573151927,"Cmaj7" -67.059229024,"Cdim" -67.941587301,"Cm" -69.938503401,"Gmaj7" -71.981859410,"Cm" -73.700136054,"D7" -74.443174603,"Ebmaj7" -74.954013605,"D7" -75.418412698,"G" -79.040725623,"C" -80.944761904,"Dm" -82.709478458,"Ebmaj7" -84.381315192,"Gmaj7" -86.331791383,"Abmaj7" -88.421587301,"D7" -90.139863945,"G7" -93.855056689,"Cm" -95.712653061,"Fm" -97.523809523,"Cm" -98.452607709,"D" -98.777687074,"C7" -99.288526077,"G" -103.746757369,"Gm6" -105.279274376,"Fm7" -106.440272108,"Fm6" -107.322630385,"Cmaj7" -108.297868480,"Cm" -108.808707482,"C#dim" -109.644625850,"Ab" -110.480544217,"G" -112.338140589,"Fm7" -113.917097505,"Cm" -114.567256235,"Cmaj7" -115.217414965,"C#" -118.375328798,"Emaj7" -119.025487528,"Gmaj7" -120.279365079,"Cm" -123.762358276,"Ab6" +29.767981859,"Gmaj7" +31.950657596,"Eb6" +33.854693877,"Fm7" +35.990929705,"Cm7" +37.848526077,"Fm7" +39.659682539,"Cm" +41.099319727,"G" +42.910476190,"Cm" +44.210793650,"G7" +44.675192743,"D7" +45.557551020,"G7" +46.254149659,"Cm7" +48.576145124,"Fm7" +49.876462585,"Cm" +52.012698412,"Fm" +53.684535147,"Cm" +54.566893424,"F6" +55.867210884,"G" +57.028208616,"Cm" +58.607165532,"G" +61.022040816,"Cm7" +62.879637188,"Fm7" +63.947755102,"Abm7b5" +64.365714285,"Eb" +65.526712018,"Cmaj7" +67.012789115,"Cdim" +67.895147392,"Cm" +69.892063492,"Gmaj7" +71.935419501,"Cm" +73.653696145,"D7" +75.325532879,"G" +78.994285714,"C" +80.898321995,"Dm" +82.663038548,"Ebmaj7" +84.334875283,"Gmaj7" +86.285351473,"Abmaj7" +88.375147392,"D7" +90.093424036,"G7" +93.808616780,"Cm" +95.666213151,"Fm" +97.477369614,"Cm" +98.406167800,"D" +98.731247165,"C7" +99.242086167,"G" +103.700317460,"Gm6" +105.232834467,"Fm7" +106.440272108,"F6" +107.276190476,"Cmaj7" +108.251428571,"Cm" +108.762267573,"C#dim" +109.598185941,"Ab" +110.434104308,"G" +112.291700680,"Fm7" +113.870657596,"Cm" +114.520816326,"Cmaj7" +115.170975056,"C#" +118.328888888,"Emaj7" +118.932607709,"Gmaj7" +120.232925170,"Cm" +123.715918367,"Ab6" 124.226757369,"G7" -124.691156462,"Eb6" -128.174149659,"Ab6" -128.684988662,"G7" -129.195827664,"Cm" +124.644716553,"Eb6" +128.127709750,"Ab6" +128.638548752,"G7" +129.149387755,"Cm" 132.632380952,"Ab6" -133.236099773,"G7" -133.793378684,"Ab6" -134.350657596,"G7" -134.722176870,"Eb6" -136.394013605,"G7" -141.595283446,"Bbm" -142.616961451,"Cm7" -144.846077097,"Fm" -146.610793650,"Cm" -148.375510204,"Fm7" -150.372426303,"Cm" -150.976145124,"Dm7" -153.437460317,"Cm7" -154.784217687,"F7" -155.155736961,"G" -156.827573696,"Cm" -159.381768707,"Fm7" -161.192925170,"Cm" -163.236281179,"Dm7b5/C" -164.861678004,"Cm" -166.626394557,"Gmaj7" -168.344671201,"Cm" -169.412789115,"F7" -169.737868480,"Gaug" -170.341587301,"D7" -171.316825396,"Cmaj7" -173.917460317,"Caug" -175.078458049,"Fm6" -175.542857142,"Cm" -176.332335600,"C" -177.354013605,"Fm" -177.864852607,"Cmaj7" -178.979410430,"Cm" -180.140408163,"D7" -180.976326530,"Gmaj7" -182.415963718,"Cm" -183.809160997,"G" -186.038276643,"C" -191.285986394,"Fm" -193.143582766,"C" -194.351020408,"Bb7/D" -194.954739229,"G" -196.673015873,"Cm" -199.970249433,"F#m7b5" -200.388208616,"Fm7" +133.143219954,"G7" +133.746938775,"Ab6" +134.304217687,"G7" +134.675736961,"Eb6" +136.347573696,"G7" +141.548843537,"Bbm" +142.663401360,"Cm7" +144.799637188,"Fm" +146.517913832,"Cm" +148.329070294,"Fm7" +150.325986394,"Cm" +150.929705215,"Dm7" +153.391020408,"Cm7" +154.737777777,"F7" +155.109297052,"G" +157.384852607,"Cm7" +159.335328798,"Fm7" +161.146485260,"Cm" +163.189841269,"Dm7b5/C" +164.815238095,"Cm" +166.579954648,"Gmaj7" +168.298231292,"Cm" +170.295147392,"D7" +171.223945578,"Cmaj7" +173.871020408,"Caug" +175.032018140,"Fm6" +175.496417233,"Cm" +176.285895691,"Cmaj7" +178.886530612,"Cm" +180.093968253,"D7" +181.022766439,"Gmaj7" +182.369523809,"Cm" +183.762721088,"G" +185.991836734,"C" +191.239546485,"Fm" +193.097142857,"C" +194.258140589,"Bb7/D" +194.908299319,"G" +196.626575963,"Cm" +199.923809523,"F#m7b5" +200.341768707,"Fm7" 202.245804988,"Cmaj7" -202.803083900,"Cdim" -203.964081632,"C#dim" -204.521360544,"C#aug" -204.800000000,"Ab" -205.682358276,"G" -207.586394557,"Fm7" -208.933151927,"G7/B" -209.397551020,"Cm" -210.372789115,"C#" -214.180861678,"Cm7" -214.738140589,"Gm7" -215.852698412,"Cm" -219.335691609,"Ab/Eb" -219.846530612,"G7" -220.310929705,"Cm" -223.840362811,"Ab6" -224.304761904,"G7" -224.815600907,"Cm" -228.298594104,"Ab6" -228.809433106,"G7" -229.366712018,"Ab6" -229.877551020,"G7" -230.388390022,"Cm" -236.889977324,"N" +202.756643990,"Cdim" +203.917641723,"C#dim" +204.707120181,"Ab" +205.635918367,"G" +207.539954648,"Fm7" +209.351111111,"Cm" +210.326349206,"C#" +214.134421768,"Cm7" +214.691700680,"Gm7" +215.759818594,"Cm" +219.289251700,"Ab/Eb" +219.800090702,"G7" +220.264489795,"Cm" +223.793922902,"Ab6" +224.258321995,"G7" +224.769160997,"Cm" +228.252154195,"Ab6" +228.762993197,"G7" +229.320272108,"Ab6" +229.831111111,"G7" +230.341950113,"Cm" +236.843537414,"N"
--- a/regression/regression.sh Mon Nov 02 15:18:39 2015 +0000 +++ b/regression/regression.sh Wed Nov 04 15:09:33 2015 +0000 @@ -4,9 +4,9 @@ mydir=$(dirname "$0") -source_url=https://code.soundsoftware.ac.uk/attachments/download/1696/Zweieck-Duell.mp3 +source_url=https://code.soundsoftware.ac.uk/attachments/download/1698/Zweieck-Duell.ogg -testfile="$mydir/input.mp3" +testfile="$mydir/input.ogg" outfile="$mydir/output.csv" expfile="$mydir/expected.csv"