Mercurial > hg > semantic-sia

changeset 38:1f09e7ded739

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
searches model for instances of the Datapoint Class rather than for Datapoint individuals
author stevenh
date Thu, 28 Mar 2013 19:37:08 +0000
parents cb7f70e10a0c
children 88362f5eefa3
files src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java	Tue Feb 26 13:30:46 2013 +0000
+++ b/src/org/qmul/eecs/c4dm/sia/SiaDatapointFactory.java	Thu Mar 28 19:37:08 2013 +0000
@@ -11,9 +11,9 @@
 import org.qmul.eecs.c4dm.sia.model.OrderedIndex;
 import org.qmul.eecs.c4dm.sia.model.OrderedSet;
 
-import com.hp.hpl.jena.ontology.Individual;
 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.Resource;
@@ -22,27 +22,29 @@
 
 public class SiaDatapointFactory {
 
+	/**
+	 * @param ontModel
+	 * @return List<Datapoint>
+	 */
 	public static List<Datapoint> create(OntModel ontModel) {
 		
 		OntClass datapointClass = ontModel.getOntClass(Datapoint.RESOURCE_URI);
-
-		Resource datapointResource = ontModel.getOntResource(datapointClass);
-		ExtendedIterator<Individual> datapointIter = ontModel.listIndividuals(datapointResource);
+		
+		ExtendedIterator<? extends OntResource> datapointIter = datapointClass.listInstances();
 
 		List<Datapoint> datapointsList = new ArrayList<Datapoint>();
 		Datapoint datapoint;
 		
 		// Find all rdf datapoints
-		Individual datapointIndividual;
+		OntResource datapointIndividual;
 		while (datapointIter.hasNext())
 		{
 			datapointIndividual = datapointIter.next();
 			datapoint = new Datapoint();
 			datapoint.setResource(datapointIndividual);
-
-			Resource subject = ontModel.getResource(datapointIndividual.toString());
+			
 			Vector<DimensionValue> dimValsList = SiaDimensionValueFactory.getDimensionValuesForResource(
-					ontModel, subject);
+					ontModel, datapointIndividual.asResource());
 			
 			datapoint.setDimensionValues(dimValsList);
 			datapointsList.add(datapoint);
@@ -51,6 +53,10 @@
 		return datapointsList;
 	}
 
+	/**
+	 * @param ontModel
+	 * @param datapoints
+	 */
 	public static void assertOrder(OntModel ontModel, List<Datapoint> datapoints) {
 		
 		Resource bnode = ontModel.createResource(AnonId.create());