# HG changeset patch
# User stevenh
# Date 1375436442 -3600
# Node ID 260eb78f0854d81792d30d26293b7e54e47f861a
# Parent  6027dbd0758d4267bc4e2b884349f9ea88fdfcd6
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

diff -r 6027dbd0758d -r 260eb78f0854 src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java
--- a/src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java	Fri Aug 02 10:35:48 2013 +0100
+++ b/src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java	Fri Aug 02 10:40:42 2013 +0100
@@ -10,13 +10,17 @@
 import org.qmul.eecs.c4dm.sia.model.MemberOfOrderedSet;
 import org.qmul.eecs.c4dm.sia.model.OrderedIndex;
 import org.qmul.eecs.c4dm.sia.model.OrderedSet;
+import org.qmul.eecs.c4dm.sia.model.SiaVector;
 
 import com.hp.hpl.jena.ontology.OntClass;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.ontology.OntResource;
 import com.hp.hpl.jena.rdf.model.AnonId;
 import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 import com.hp.hpl.jena.vocabulary.RDF;
 
@@ -49,9 +53,11 @@
 			datapointIndividual = datapointIter.next();
 			datapoint = new Datapoint();
 			datapoint.setResource(datapointIndividual);
+			Property vectorProperty = ontModel.getOntProperty(SiaVector.PROPERTY_URI);
+			Statement vector = datapointIndividual.getProperty(vectorProperty);
 			
 			Vector<DimensionValue> dimValsList = SiaDimensionValueFactory.getDimensionValuesForResource(
-					ontModel, datapointIndividual.asResource());
+					ontModel, vector.getResource());
 			
 			datapoint.setDimensionValues(dimValsList);
 			datapointsList.add(datapoint);