Updated the testing code for QuadTree

git-svn-id: https://java-algorithms-implementation.googlecode.com/svn/trunk@395 032fbc0f-8cab-eb90-e552-f08422b9a96a

Author: phishman3579

src/com/jwetherell/algorithms/DataStructures.java

@@ -7325,7 +7325,7 @@ private static boolean testPatriciaTrie() {
     @SuppressWarnings("unchecked")
     private static boolean testQuadTree() {
         int listSize = 10;
-        int size = 10000;
+        int size = 16000;
         java.util.List<QuadTree.XYPoint>[] lists = new java.util.List[listSize];
         for (int i=0; i<listSize; i++) {
             java.util.List<QuadTree.XYPoint> list = new java.util.LinkedList<QuadTree.XYPoint>();
@@ -7361,13 +7361,16 @@ private static boolean testQuadTree() {
         long afterTreeQuery;
         long insertTime;
         long queryTime;
+        long avgInsertTime;
+        long avgQueryTime;
         long treeMemory;
         long treeQuery;
 
         // Point based quad tree
         {
             QuadTree.PointQuadTree<QuadTree.XYPoint> tree = new QuadTree.PointQuadTree<QuadTree.XYPoint>(0,0,size,size);
             beforeMemory = DataStructures.getMemoryUse();
+            avgInsertTime = 0;
             for (int i=0; i<listSize; i++) {
                 java.util.List<QuadTree.XYPoint> list = lists[i];
                 beforeInsert = System.currentTimeMillis();
@@ -7378,7 +7381,9 @@ private static boolean testQuadTree() {
 
                 insertTime = afterInsert - beforeInsert;
                 System.out.println("insertTime="+insertTime);
+                avgInsertTime += insertTime;
             }
+            System.out.println("avgInsertTime="+avgInsertTime/listSize);
             afterMemory = DataStructures.getMemoryUse();
             treeMemory = afterMemory - beforeMemory;
             System.out.println("treeMemory="+treeMemory);
@@ -7395,19 +7400,20 @@ private static boolean testQuadTree() {
             }
 
             // We should find all points here
+            avgQueryTime = 0;
             for (int i=0; i<listSize; i++) {
                 java.util.List<QuadTree.XYPoint> query = queries[i];
-                for (int j=0; j<listSize; j++) {
-                    beforeQuery = System.currentTimeMillis();
-                    for (QuadTree.XYPoint p : query) {
-                        tree.queryRange(p.getX(), p.getY(), 1, 1);
-                    }
-                    afterQuery = System.currentTimeMillis();
-
-                    queryTime = afterQuery - beforeQuery;
-                    System.out.println("queryTime="+queryTime);
+                beforeQuery = System.currentTimeMillis();
+                for (QuadTree.XYPoint p : query) {
+                    tree.queryRange(p.getX(), p.getY(), 1, 1);
                 }
+                afterQuery = System.currentTimeMillis();
+
+                queryTime = afterQuery - beforeQuery;
+                System.out.println("queryTime="+queryTime);
+                avgQueryTime += queryTime;
             }
+            System.out.println("avgQueryTime="+avgQueryTime/listSize);
 
             // Result set should not contain duplicates
             beforeTreeQuery = System.currentTimeMillis();
@@ -7427,6 +7433,7 @@ private static boolean testQuadTree() {
         {
             QuadTree.RectangleQuadTree<QuadTree.AxisAlignedBoundingBox> tree = new QuadTree.RectangleQuadTree<QuadTree.AxisAlignedBoundingBox>(0,0,size,size);
             beforeMemory = DataStructures.getMemoryUse();
+            avgInsertTime = 0;
             for (int i=0; i<listSize; i++) {
                 java.util.List<QuadTree.XYPoint> list = lists[i];
                 beforeInsert = System.currentTimeMillis();
@@ -7437,8 +7444,9 @@ private static boolean testQuadTree() {
 
                 insertTime = afterInsert - beforeInsert;
                 System.out.println("insertTime="+insertTime);
-
+                avgInsertTime += insertTime;
             }
+            System.out.println("avgInsertTime="+avgInsertTime/listSize);
             afterMemory = DataStructures.getMemoryUse();
             treeMemory = afterMemory - beforeMemory;
             System.out.println("treeMemory="+treeMemory);
@@ -7455,19 +7463,20 @@ private static boolean testQuadTree() {
             }
 
             // We should find all points here
+            avgQueryTime = 0;
             for (int i=0; i<listSize; i++) {
                 java.util.List<QuadTree.XYPoint> query = queries[i];
-                for (int j=0; j<listSize; j++) {
-                    beforeQuery = System.currentTimeMillis();
-                    for (QuadTree.XYPoint p : query) {
-                        tree.queryRange(p.getX(), p.getY(), 1, 1);
-                    }
-                    afterQuery = System.currentTimeMillis();
-    
-                    queryTime = afterQuery - beforeQuery;
-                    System.out.println("queryTime="+queryTime);
+                beforeQuery = System.currentTimeMillis();
+                for (QuadTree.XYPoint p : query) {
+                    tree.queryRange(p.getX(), p.getY(), 1, 1);
                 }
+                afterQuery = System.currentTimeMillis();
+
+                queryTime = afterQuery - beforeQuery;
+                System.out.println("queryTime="+queryTime);
+                avgQueryTime += queryTime;
             }
+            System.out.println("avgQueryTime="+avgQueryTime/listSize);
 
             // Result set should not contain duplicates
             beforeTreeQuery = System.currentTimeMillis();