comparison src/org/qmul/eecs/c4dm/sia/model/VectorTable.java @ 48:ad9ef7637caa

initialise vteList

renamed some variables

 package org.qmul.eecs.c4dm.sia.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class VectorTable {
 
-	private List<VectorTableElement> vteList;
+	private List<VectorTableElement> vteList = new ArrayList<VectorTableElement>();
 	private int numDatapoints; // the number of datapoints used to create this Vector Table
 	
 	public VectorTableElement get(int i)
 	{
 		return vteList.get(i);
 	}
 	
-	public NDimensionalObject getVector(int i, int j)
+	public NDimensionalObject getVector(int fromIndex, int toIndex)
 	{
 		NDimensionalObject vector = new NDimensionalObject();
 		
 		for (VectorTableElement vte : vteList)
 		{
-			if (vte.getFromDatapoint().getOrderedIndex() == i && vte.getToDatapoint().getOrderedIndex() == j)
+			if (vte.getFromDatapoint().getOrderedIndex() == fromIndex && vte.getToDatapoint().getOrderedIndex() == toIndex)
 			{
-				vector = vte.getVector();
+				vector = vte;
 				break;
 			}
 		}
 
 		return vector;