Mercurial > hg > semantic-sia

changeset 69:94e6592eb106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified to take into account that sia:Datapoints now have sia:vector properties which then have sia:dimVals, rather than sia:Datapoints having their own sia:dimVal properties
author stevenh
date Fri, 02 Aug 2013 11:13:10 +0100
parents 260eb78f0854
children fe08d8cdd150
files src/sparql/insert_datapoint_order_bar_one.sparql
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/sparql/insert_datapoint_order_bar_one.sparql	Fri Aug 02 10:40:42 2013 +0100
+++ b/src/sparql/insert_datapoint_order_bar_one.sparql	Fri Aug 02 11:13:10 2013 +0100
@@ -15,12 +15,16 @@
 		SELECT ?datapoint1 (COUNT (?datapoint2) AS ?numSmallerDatapoints) ?dataset
 		WHERE
 		{
-			?datapoint1 sia:dimVal ?dimVal1x .
+			?datapoint1 sia:vector ?vector1 .
+			?vector1 a sia:Vector .
+			?vector1 sia:dimVal ?dimVal1x .
 			?datapoint1 sia:memberOfDataset ?dataset .
 			?dimVal1x sia:dimension ?smallestDimensionMin .
 			?dimVal1x sia:value ?value1x .
 
-			?datapoint2 sia:dimVal ?dimVal2x .
+			?datapoint2 sia:vector ?vector2 .
+			?vector2 a sia:Vector .
+			?vector2 sia:dimVal ?dimVal2x .
 			?dimVal2x sia:dimension ?smallestDimensionMin .
 			?dimVal2x sia:value ?value2x .
 			
@@ -30,15 +34,19 @@
 				SELECT ?datapoint1 ?datapoint2 (MIN(?dimension) AS ?smallestDimensionMin)
 				WHERE
 				{
+					?datapoint1 sia:vector ?vector1 .
+					?vector1 a sia:Vector .
 					?datapoint1 a sia:Datapoint .
 					?datapoint1 sia:memberOfDataset ?dataset .
-					?datapoint1 sia:dimVal ?dimVal1 .
+					?vector1 sia:dimVal ?dimVal1 .
 					?dimVal1 sia:dimension ?dimension .
 					?dimVal1 sia:value ?value1 .
 		
+					?datapoint2 sia:vector ?vector2 .
+					?vector2 a sia:Vector .
 					?datapoint2 a sia:Datapoint .
 					?datapoint2 sia:memberOfDataset ?dataset .
-					?datapoint2 sia:dimVal ?dimVal2 .
+					?vector2 sia:dimVal ?dimVal2 .
 					?dimVal2 sia:dimension ?dimension .
 					?dimVal2 sia:value ?value2 .