diff src/org/qmul/eecs/c4dm/sia/model/Datapoint.java @ 72:59ebd2ecbcb0

now extends SiaVector

--- a/src/org/qmul/eecs/c4dm/sia/model/Datapoint.java	Fri Aug 02 15:11:23 2013 +0100
+++ b/src/org/qmul/eecs/c4dm/sia/model/Datapoint.java	Fri Aug 02 15:37:26 2013 +0100
@@ -1,79 +1,13 @@
 package org.qmul.eecs.c4dm.sia.model;
 
-import java.util.Vector;
-
-import org.qmul.eecs.c4dm.sia.exceptions.DimensionException;
 import org.qmul.eecs.c4dm.sia.rdf.Namespaces;
 
-import com.hp.hpl.jena.rdf.model.Resource;
-
 /**
  * @author steven hargreaves
  *
  */
-public class Datapoint extends NDimensionalObject {
-	
-	private Resource resource;
-	private int orderedIndex;
+public class Datapoint extends SiaVector {
 	
 	public static final String RESOURCE_URI    = Namespaces.SIA_NS_URI + "Datapoint";
 
-	/**
-	 * @return the resource
-	 */
-	public Resource getResource() {
-		return resource;
-	}
-
-	/**
-	 * @param resource the node to set
-	 */
-	public void setResource(Resource resource) {
-		this.resource = resource;
-	}
-
-	/**
-	 * @return the orderedIndex
-	 */
-	public int getOrderedIndex() {
-		return orderedIndex;
-	}
-
-	/**
-	 * @param orderedIndex the orderedIndex to set
-	 */
-	public void setOrderedIndex(int orderedIndex) {
-		this.orderedIndex = orderedIndex;
-	}
-	
-	/**
-	 * @param d
-	 * @return
-	 */
-	public NDimensionalObject subtract(Datapoint d)
-	{
-		NDimensionalObject nDimObj = new NDimensionalObject();
-		Vector<DimensionValue> dimVals = new Vector<DimensionValue>();
-		int dimensions = d.getDimensionValues().size();
-		DimensionValue dimVal;
-		
-		for (int dimension = 1; dimension <= dimensions; dimension++)
-		{
-			dimVal = new DimensionValue();
-			dimVal.setDimension(dimension);
-			
-			try {
-				dimVal.setValue(this.getDimensionValue(dimension) - d.getDimensionValue(dimension));
-			} catch (DimensionException e) {
-				e.printStackTrace();
-				System.exit(1);
-			}
-			
-			dimVals.add(dimVal);
-		}
-		
-		nDimObj.setDimensionValues(dimVals);
-		return nDimObj;
-	}
-
 }