changeset 74:3954fc89e155

restructuring repo
author christopherh <christopher.harte@eecs.qmul.ac.uk>
date Tue, 12 May 2015 22:12:29 +0100
parents 730e7e973973
children 0c744fb4c202
files Syncopation models/Requirements.txt Syncopation models/TimeSignature.pkl Syncopation models/results.csv Syncopation models/rhythmbase/clave.txt Syncopation models/rhythmbase/testrhythm.txt Syncopation models/text_bnf_syntax.txt
diffstat 6 files changed, 0 insertions(+), 310 deletions(-) [+]
line wrap: on
line diff
--- a/Syncopation models/Requirements.txt	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-- Can read .txt file containing timesig and rhythm sequence bar by bar
-- Can detect the information is not given by the required format, and give alerts
-
-- Can read .midi file
-- User can add timesig if is not included in the time-signature dictionary
-- 
\ No newline at end of file
--- a/Syncopation models/TimeSignature.pkl	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-(dp1
-S'2/4'
-p2
-(lp3
-(lp4
-I1
-aI2
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'3/2'
-p5
-(lp6
-(lp7
-I1
-aI3
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'3/4'
-p8
-(lp9
-(lp10
-I1
-aI3
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'12/8'
-p11
-(lp12
-(lp13
-I1
-aI2
-aI2
-aI3
-aI2
-aI2
-aaI2
-asS'3/8'
-p14
-(lp15
-(lp16
-I1
-aI3
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'2/2'
-p17
-(lp18
-(lp19
-I1
-aI2
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'6/8'
-p20
-(lp21
-(lp22
-I1
-aI2
-aI3
-aI2
-aI2
-aI2
-aaI1
-asS'5/4'
-p23
-(lp24
-(lp25
-I1
-aI5
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'4/2'
-p26
-(lp27
-(lp28
-I1
-aI2
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'7/4'
-p29
-(lp30
-(lp31
-I1
-aI7
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'5/8'
-p32
-(lp33
-(lp34
-I1
-aI5
-aI2
-aI2
-aI2
-aI2
-aaI1
-asS'4/4'
-p35
-(lp36
-(lp37
-I1
-aI2
-aI2
-aI2
-aI2
-aI2
-aaI2
-asS'9/8'
-p38
-(lp39
-(lp40
-I1
-aI3
-aI3
-aI2
-aI2
-aI2
-aaI1
-as.
\ No newline at end of file
--- a/Syncopation models/results.csv	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-Rhythm, LHL, PRS, TMC, SG, TOB, KTH, WNBD
-ab.rhy,3,7.5,2,0.520833333333,1,3,0
-abab.rhy,5,12.5,5,1.27604166667,2,6,4.0
-ac.rhy,2,5.0,1,0.3125,0,3,0
-ad.rhy,2,5.5,2,0.451388888889,1,2,0
-adad.rhy,4,10.5,5,1.20659722222,2,4,8.0
-af.rhy,None,None,None,None,1,3,3.0
-ag.rhy,None,None,None,None,0,3,3.0
-ah.rhy,None,None,None,None,1,6,9.0
-aj.rhy,None,None,None,None,1,3,3.0
-ak.rhy,None,None,None,None,0,3,3.0
-al.rhy,None,None,None,None,1,6,9.0
-ba.rhy,3,7.5,2,0.510416666667,1,3,0
-baba.rhy,6,12.5,5,1.23958333333,2,6,4.0
-bb.rhy,3,10.0,3,1.03125,2,6,0
-bbbb.rhy,6,15.0,7,2.515625,4,12,16.0
-bc.rhy,2,6.5,2,0.423611111111,1,1,0
-bcbc.rhy,3,11.5,5,1.15277777778,2,2,4.0
-bd.rhy,2,7.0,2,0.5625,2,3,0
-bdbd.rhy,4,12.0,5,1.421875,4,6,12.0
-bf.rhy,None,None,None,None,0,5,6.0
-bg.rhy,None,None,None,None,0,4,3.0
-bh.rhy,None,None,None,None,0,6,12.0
-bj.rhy,None,None,None,None,0,3,6.0
-bk.rhy,None,None,None,None,0,4,3.0
-bl.rhy,None,None,None,None,0,6,12.0
-ca.rhy,-1,0,0,0.0,0,0,0
-cb.rhy,1,4.5,1,0.208333333333,1,1,0
-cbcb.rhy,1,7.5,2,0.486111111111,2,2,4.0
-cc.rhy,-1,1.0,0,0.0,0,0,0
-cd.rhy,-1,3.5,0,0.0,1,0,0
-cdcd.rhy,-1,6.5,0,0.0,2,0,4.0
-cf.rhy,None,None,None,None,1,3,3.0
-cg.rhy,None,None,None,None,0,3,6.0
-ch.rhy,None,None,None,None,1,6,9.0
-cj.rhy,None,None,None,None,1,3,3.0
-ck.rhy,None,None,None,None,0,3,6.0
-cl.rhy,None,None,None,None,1,6,9.0
-da.rhy,1,2.5,1,0.260416666667,1,2,0
-dada.rhy,2,4.5,2,0.607638888889,2,4,8.0
-db.rhy,1,5.0,1,0.46875,2,3,0
-dbdb.rhy,2,8.0,2,1.09375,4,6,12.0
-dc.rhy,-1,2.5,0,0.0,1,0,0
-dcdc.rhy,-1,4.5,0,0.0,2,0,4.0
-dd.rhy,-1,2.0,0,0.0,2,0,0
-dddd.rhy,-1,3.0,0,0.0,4,0,8.0
-df.rhy,None,None,None,None,0,5,3.0
-dg.rhy,None,None,None,None,0,3,6.0
-dh.rhy,None,None,None,None,0,6,9.0
-dj.rhy,None,None,None,None,0,3,3.0
-dk.rhy,None,None,None,None,0,3,6.0
-dl.rhy,None,None,None,None,0,6,9.0
-fa.rhy,None,None,None,None,0,3,3.0
-fb.rhy,None,None,None,None,0,5,6.0
-fc.rhy,None,None,None,None,0,3,3.0
-fd.rhy,None,None,None,None,0,5,3.0
-ff.rhy,3,10.0,3,0.90625,1,None,12.0
-fg.rhy,3,5.0,None,None,0,None,12.0
-fh.rhy,3,10.0,3,0.947916666667,1,None,15.0
-fj.rhy,2,7.5,2,0.819444444444,1,None,9.0
-fk.rhy,2,7.5,2,0.375,0,None,9.0
-fl.rhy,2,7.0,2,0.479166666667,1,None,12.0
-ga.rhy,None,None,None,None,1,3,3.0
-gb.rhy,None,None,None,None,0,4,3.0
-gc.rhy,None,None,None,None,1,3,6.0
-gd.rhy,None,None,None,None,0,3,6.0
-gf.rhy,3,10.0,3,0.9375,2,None,12.0
-gg.rhy,3,10.0,3,0.875,1,None,12.0
-gh.rhy,3,10.0,3,0.979166666667,2,None,15.0
-gj.rhy,2,8.5,2,1.25,2,None,9.0
-gk.rhy,2,8.5,2,0.805555555556,1,None,9.0
-gl.rhy,2,8.0,2,0.909722222222,2,None,12.0
-ha.rhy,None,None,None,None,1,6,9.0
-hb.rhy,None,None,None,None,0,6,12.0
-hc.rhy,None,None,None,None,1,6,9.0
-hd.rhy,None,None,None,None,0,6,9.0
-hf.rhy,3,10.0,3,0.989583333333,2,None,15.0
-hg.rhy,3,10.0,3,0.927083333333,1,None,15.0
-hh.rhy,3,10.0,3,1.03125,2,None,18.0
-hj.rhy,2,7.5,2,0.902777777778,2,None,12.0
-hk.rhy,2,7.5,2,0.458333333333,1,None,12.0
-hl.rhy,2,7.0,2,0.5625,2,None,15.0
-ja.rhy,None,None,None,None,0,3,3.0
-jb.rhy,None,None,None,None,0,3,6.0
-jc.rhy,None,None,None,None,0,3,3.0
-jd.rhy,None,None,None,None,0,3,3.0
-jf.rhy,1,5.5,1,0.59375,1,None,9.0
-jg.rhy,1,1.0,None,None,0,None,9.0
-jh.rhy,1,5.5,1,0.635416666667,1,None,12.0
-jj.rhy,0,6.0,0,0.333333333333,1,None,6.0
-jk.rhy,0,4.5,0,0.375,0,None,6.0
-jl.rhy,0,5.0,0,0.166666666667,1,None,9.0
-ka.rhy,None,None,None,None,1,3,3.0
-kb.rhy,None,None,None,None,0,4,3.0
-kc.rhy,None,None,None,None,1,3,6.0
-kd.rhy,None,None,None,None,0,3,6.0
-kf.rhy,1,5.5,1,0.375,2,None,9.0
-kg.rhy,1,5.5,1,0.625,1,None,9.0
-kh.rhy,1,5.5,1,0.416666666667,2,None,12.0
-kj.rhy,0,5.5,0,0.375,2,None,6.0
-kk.rhy,0,4.0,0,0.416666666667,1,None,6.0
-kl.rhy,0,4.5,0,0.208333333333,2,None,9.0
-la.rhy,None,None,None,None,1,6,9.0
-lb.rhy,None,None,None,None,0,6,12.0
-lc.rhy,None,None,None,None,1,6,9.0
-ld.rhy,None,None,None,None,0,6,9.0
-lf.rhy,1,5.0,1,0.427083333333,2,None,12.0
-lg.rhy,1,5.0,1,0.677083333333,1,None,12.0
-lh.rhy,1,5.0,1,0.46875,2,None,15.0
-lj.rhy,0,5.0,0,0.166666666667,2,None,9.0
-lk.rhy,0,3.5,0,0.208333333333,1,None,9.0
-ll.rhy,-1,2.0,0,0.0,2,None,12.0
--- a/Syncopation models/rhythmbase/clave.txt	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#this is a comment too
-
-t{4/4}qpm{100}v{1,0,0,1,0,0,1,0,0,0,1,0,1,0,0,0} # this is a comment
-v{1,0,0,1,0,0, 1,0,0,0,1,0, 1,0,0,0}
-TPQ{1000}
-t{3/4}
-
-#this is a comment
- v{1,1,1} qpm{120} v{1,0,1,0,1,0}
-
-
- y{(1,2,3),(3,2,3),(4,2,2)}
\ No newline at end of file
--- a/Syncopation models/rhythmbase/testrhythm.txt	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-t{4/4} v{1,0,0,1,0,0,1,0,0,0,1,0,0.8,0,0,0} # This is a comment
-v{1,0,0,1,0,0,1,0,0,0,1,0,1,0,0,0}
-t{3/4} v{1,1,1}
--- a/Syncopation models/text_bnf_syntax.txt	Tue May 12 09:38:02 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-
-<piece> ::=  [<comment-lines>] <timesig> <line> | <piece> <line>
-
-<comment-lines> ::= <comment> "\n" | <comment-lines> <comment> "\n"
-
-<tempo> ::= "QPM{" <digits> "}"
-
-<ticks per quarter> ::= "TPQ{" <digits> "}"
-
-<line> ::= [<barlist>] [<comment>] "\n"
-
-<comment> ::= "#" <comment-text>
-
-<barlist> ::= <time-info> | [<time-info>] <bar> | <barlist> <bar>
-
-<time-info> ::= [<timesig>] [<ticks per quarter>] [<tempo>] 
-
-<timesig> ::= "t{" <digit> "/" <digit> "}"
-
-<bar> ::= "v{" <velocity-sequence> "}" | "y{" <note-sequence> "}"
-
-<note-sequence> ::= <note> | <note-sequence> "," <note>
-
-<note> ::= "(" <digits> "," <digits> "," <digits> ")"
-
-<velocity-sequence> ::= <decimal> | <velocity-sequence> "," <decimal>
-
-<decimal> ::= "0" | "1" | "0." <digits>
-
-<digits> ::= <digit> | <digits> <digit>
-
-<digit> ::= "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"