# HG changeset patch
# User cannam
# Date 1214845243 0
# Node ID 64709b340651ee2478d67b597828a4515e41c00d
# Parent  7c08ba8083b2b7ae46ba6a0a575d38da2d689fa4
* Update to newer audio features ontology

diff -r 7c08ba8083b2 -r 64709b340651 rdf/generator/template-generator.cpp
--- a/rdf/generator/template-generator.cpp	Wed Jun 25 12:20:22 2008 +0000
+++ b/rdf/generator/template-generator.cpp	Mon Jun 30 17:00:43 2008 +0000
@@ -294,8 +294,9 @@
     }
 
     //There is no way to know this in advance, but we can use the km a bit for this.
-    res+="#   vamp:computes_feature_type  <Place feature type URI here and uncomment> ;\n";
-    res+="#   vamp:computes_event_type    <Place event type URI here and uncomment> ;\n";
+    res+="#   vamp:computes_event_type   <Place event type URI here and uncomment> ;\n";
+    res+="#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;\n";
+    res+="#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;\n";
     res+="    .\n";
 
     return res;
diff -r 7c08ba8083b2 -r 64709b340651 rdf/vamp.n3
--- a/rdf/vamp.n3	Wed Jun 25 12:20:22 2008 +0000
+++ b/rdf/vamp.n3	Mon Jun 30 17:00:43 2008 +0000
@@ -430,29 +430,41 @@
 
 #These last 2 properties are included to match the Audio Features Ontology (not estrictly from the Vamp API).
 
-vamp:computes_feature_type
-	a rdf:Property;
-	a owl:ObjectProperty;
-	rdfs:label "feature type";
-	rdfs:comment """
-			Feature Types output by the plugin. Links the vamp ontology to the audio features ontology.
-	""";
-	rdfs:domain vamp:PluginOutput;
-	rdfs:range af:AudioFeature;
-	vs:term_status "unstable";
-	.
-
 vamp:computes_event_type
 	a rdf:Property;
 	a owl:ObjectProperty;
 	rdfs:label "event type";
 	rdfs:comment """
-			Event Type output by the plugin.
+			Associates a plugin output with its corresponding event type (for example, in the Audio Features ontology).
 	""";
 	rdfs:domain vamp:PluginOutput;
 	rdfs:range event:Event;
 	vs:term_status "unstable";
 	.
+
+vamp:computes_feature
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "feature type";
+	rdfs:comment """
+			Associates a plugin output with the attribute connecting the event to its value data.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range event:factor;
+	vs:term_status "unstable";
+	.
+
+vamp:computes_signal_type
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "signal type";
+	rdfs:comment """
+			Associates a dense plugin output with its corresponding signal type (for example, in the Audio Features ontology).
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range af:Signal;
+	vs:term_status "unstable";
+	.
 	
 ########################
 # INDIVIDUALS