changeset 11:72cad1c30b79

Merge

--- a/iterative-chroma/chroma-excerpt.ttl	Mon Feb 02 18:56:41 2015 +0000
+++ b/iterative-chroma/chroma-excerpt.ttl	Tue Feb 03 18:46:54 2015 +0000
@@ -3,25 +3,18 @@
 @prefix :         <#> .
 
 :transform a vamp:Transform ;
-    vamp:plugin <http://vamp-plugins.org/rdf/plugins/cqvamp#cqchromavamp> ;
-    vamp:step_size "1024"^^xsd:int ; 
-    vamp:block_size "1024"^^xsd:int ; 
-    vamp:plugin_version """1""" ;
+    vamp:plugin <http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-chromagram> ;
     vamp:duration "PT30S"^^xsd:duration ;
     vamp:parameter_binding [
         vamp:parameter [ vamp:identifier "bpo" ] ;
-        vamp:value "12"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "lowestoct" ] ;
-        vamp:value "0"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "octaves" ] ;
-        vamp:value "7"^^xsd:float ;
+        vamp:value "60"^^xsd:float ;
     ] ;
     vamp:parameter_binding [
         vamp:parameter [ vamp:identifier "tuning" ] ;
         vamp:value "440"^^xsd:float ;
     ] ;
-    vamp:output <http://vamp-plugins.org/rdf/plugins/cqvamp#cqchromavamp_output_chromagram> .
+    vamp:parameter_binding [
+        vamp:parameter [ vamp:identifier "normalization" ] ;
+        vamp:value "1"^^xsd:float ;  # unit sum
+    ] ;
+    vamp:output <http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-chromagram_output_chromagram> .

--- a/iterative-chroma/chromacompare.sh	Mon Feb 02 18:56:41 2015 +0000
+++ b/iterative-chroma/chromacompare.sh	Tue Feb 03 18:46:54 2015 +0000
@@ -38,7 +38,7 @@
     hz="$1"
     file="$2"
     cat chroma-excerpt.ttl | sed 's,"440","'"$hz"'",' > "$transform"
-    sonic-annotator -t "$transform" --summary mean --summary-only -w csv --csv-stdout --csv-omit-filename "$file" 2>/dev/null | cut -d, -f4-15 | sed 's/,/\n/g'
+    sonic-annotator -t "$transform" --summary mean --summary-only -w csv --csv-stdout --csv-omit-filename "$file" 2>/dev/null | cut -d, -f4-63 | sed 's/,/\n/g'
 }
 
 extract 440 "$reference" | cat -n > "$refchroma"
@@ -59,7 +59,7 @@
 
     dist=$( cat "$tmpscript" | dc )
     echo "$dist $hz"
-
+    
 done | tee "$scores"
 
 echo

--- a/iterative-match/match-cost.ttl	Mon Feb 02 18:56:41 2015 +0000
+++ b/iterative-match/match-cost.ttl	Tue Feb 03 18:46:54 2015 +0000
@@ -2,6 +2,10 @@
 @prefix vamp:     <http://purl.org/ontology/vamp/> .
 @prefix :         <#> .
 
+:param_chroma
+    vamp:parameter [ vamp:identifier "usechroma" ] ;
+    vamp:value "1"^^xsd:float .
+
 :param_freq
     vamp:parameter [ vamp:identifier "freq2" ] ;
     vamp:value "440"^^xsd:float .
@@ -12,6 +16,7 @@
     vamp:step_size "882"^^xsd:int ; 
     vamp:block_size "2048"^^xsd:int ; 
     vamp:sample_rate "44100"^^xsd:int ;
+    vamp:parameter_binding :param_chroma ;
     vamp:parameter_binding :param_freq ;
     vamp:output [ vamp:identifier "overall_cost" ] .
 

--- a/iterative-match/matchcompare.sh	Mon Feb 02 18:56:41 2015 +0000
+++ b/iterative-match/matchcompare.sh	Tue Feb 03 18:46:54 2015 +0000
@@ -23,7 +23,7 @@
 scores="/tmp/$$.scores.txt"
 trap "rm $transform $scores" 0
 
-export VAMP_PATH="$mypath"/../match-vamp
+#export VAMP_PATH="$mypath"/../match-vamp
 
 sox "$reference" -r 44100 -c 1 a.wav
 sox "$other" -r 44100 -c 1 b.wav