Working JUnits

src/test/TestBasicSearchResult.java

@@ -51,47 +51,4 @@ public class TestBasicSearchResult {
 		BasicSearchResult bsr = BasicSearch.range(448306, 1990, 2008);	// Anura
 		assert(bsr.sum() == 9);
 	}
-}
-
-
-//public class TestBasicSearchResult {
-//	public static TrawlExpert te;
-//	
-//	@Before
-//	public void setUp() throws Exception {
-//		// Assumes serialized data is present
-//		te = new TrawlExpert();
-//		FileProcessor.setPath("smalldata.csv");
-//		FileProcessor.initProcessing();
-//	}
-//
-//	@Test
-//	public void testTaxonId() {
-//		BasicSearchResult bsr = te.rangeSearch(154210, 1990, 2000);	// Esox lucius
-//		assert(bsr.taxonId() == 154210);
-//	}
-//	
-//	@Test
-//	public void testYearLo() {
-//		BasicSearchResult bsr = te.rangeSearch(154210, 1990, 2000);	// Esox lucius
-//		assert(bsr.yearLo() == 1990);
-//	}
-//	
-//	@Test
-//	public void testYearHi() {
-//		BasicSearchResult bsr = te.rangeSearch(154210, 1990, 2000);	// Esox lucius
-//		assert(bsr.yearHi() == 2000);
-//	}
-//	
-//	@Test
-//	public void testSize() {
-//		BasicSearchResult bsr = te.rangeSearch(154210, 1990, 2000);	// Esox lucius
-//		assert(bsr.n() == 4);
-//	}
-//	
-//	@Test
-//	public void testSum() {
-//		BasicSearchResult bsr = te.rangeSearch(448306, 1990, 2008);	// Anura
-//		assert(bsr.sum() == 9);
-//	}
-//}
+}
\ No newline at end of file

src/test/TestCluster.java

@@ -33,7 +33,7 @@ public class TestCluster {
 	@Test
 	public void testCluster1() {
 		bsr = BasicSearch.range(154210, 1990, 2008);	// Esox lucius
-		clus = Cluster.cluster(1.0, bsr);
+		clus = Cluster.cluster(0.0, bsr);
 		assert(clus.size() == bsr.n());
 	}
 	
@@ -51,7 +51,7 @@ public class TestCluster {
 	public void testCluster3() {
 		bsr = BasicSearch.range(448306, 1990, 2008);	// Anura
 		clus = Cluster.cluster(30.0, bsr);
-		System.out.println(clus.get(2).N());
+		System.out.println(clus.get(0).N());
 		assert(clus.get(0).N() == 3);
 	}
 	
@@ -59,8 +59,11 @@ public class TestCluster {
 	@Test
 	public void testCluster4() {
 		bsr = BasicSearch.range(154210, 1990, 2008);	// Esox lucius
-		clus = Cluster.cluster(300.0, bsr);
+		clus = Cluster.cluster(9000.0, bsr);
+		String format = "|%1$-15s|%2$-15s|%3$-15s|%4$-15s|%5$-15s\n";
+		for(int i = 0; i < clus.size(); i++)
+			System.out.format(format, (i+1), String.format("%.5f", clus.get(i).centroid().getY()), String.format("%.5f", clus.get(i).centroid().getX()), clus.get(i).N(), clus.get(i).getCount());
 		System.out.println(clus.get(0).N());
-		assert(clus.get(0).N() == 4);
+		assert(clus.get(0).N() == 2);
 	}
 }