[Bigdata-commit] SF.net SVN: bigdata:[4634] branches/QUADS_QUERY_BRANCH/bigdata/src

[<mrp...@us...>]

Revision: 4634
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4634&view=rev
Author:   mrpersonick
Date:     2011-06-06 17:37:43 +0000 (Mon, 06 Jun 2011)

Log Message:
-----------
fixed a test case

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java	2011-06-06 16:01:07 UTC (rev 4633)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java	2011-06-06 17:37:43 UTC (rev 4634)
@@ -920,6 +920,24 @@
     
     }
     
+    public Hiterator search(final String query, final String languageCode,
+            final double minCosine, final boolean prefixMatch) {
+
+        return search( //
+                query,//
+                languageCode,//
+                prefixMatch,//
+                minCosine, // minCosine
+                1.0d, // maxCosine
+                1, // minRank
+                10000, // maxRank
+                false, // matchAllTerms
+                this.timeout,//
+                TimeUnit.MILLISECONDS//
+                );
+    
+    }
+    
     /**
      * Performs a full text search against indexed documents returning a hit
      * list using the configured default timeout.
@@ -1263,7 +1281,20 @@
 
     }
     
+    /**
+     * Used to support test cases.
+     */
     public int count(final String query, final String languageCode,
+    		final boolean prefixMatch) {
+    	
+    	return count(query, languageCode, prefixMatch, 0.0d, 1.0d, 1, 10000, 
+    			false, this.timeout,//
+                TimeUnit.MILLISECONDS);
+    	
+    }
+   
+    
+    public int count(final String query, final String languageCode,
             final boolean prefixMatch, 
             final double minCosine, final double maxCosine,
             final int minRank, final int maxRank, final boolean matchAllTerms,
@@ -1456,6 +1487,12 @@
         Hit[] a = hits.values().toArray(new Hit[nhits]);
         
         Arrays.sort(a);
+        
+        if (log.isDebugEnabled()) {
+        	log.debug("before min/max cosine/rank pruning:");
+        	for (Hit h : a)
+        		log.debug(h);
+        }
 
         /*
          * If maxCosine is specified, prune the hits that are above the max
@@ -1541,6 +1578,9 @@
 
         final int newMax = maxRank-minRank+1;
         
+        if (log.isDebugEnabled())
+        	log.debug("new max rank: " + newMax);
+        
         /*
          * If maxRank is specified, prune the hits that rank lower than the max
          */

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java	2011-06-06 16:01:07 UTC (rev 4633)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java	2011-06-06 17:37:43 UTC (rev 4634)
@@ -107,7 +107,8 @@
                 if (log.isInfoEnabled())
                     log.info("hits:" + itr);
 
-                assertEquals(2, itr.size());
+                assertEquals(2, ndx.count("The quick brown dog",
+                        languageCode, false/* prefixMatch */));
 
                 assertTrue(itr.hasNext());
 
@@ -134,7 +135,8 @@
                 
                 if(log.isInfoEnabled()) log.info("hits:" + itr);
                 
-                assertEquals(2, itr.size());
+                assertEquals(2, ndx.count("The qui bro do",
+                        languageCode, true/*prefixMatch*/));
 
                 assertTrue(itr.hasNext());
 
@@ -162,7 +164,8 @@
                 if(log.isInfoEnabled())
                     log.info("hits:" + itr);
 
-                assertEquals(2, itr.size());
+                assertEquals(2, ndx
+                        .count("brown", languageCode, false/* prefixMatch */));
 
             }
 
@@ -176,7 +179,8 @@
 
                 if(log.isInfoEnabled()) log.info("hits:" + itr);
 
-                assertEquals(2, itr.size());
+                assertEquals(2, ndx
+                        .count("brown", languageCode, true/* prefixMatch */));
 
             }
 
@@ -190,7 +194,8 @@
 
                 if(log.isInfoEnabled()) log.info("hits:" + itr);
 
-                assertEquals(2, itr.size());
+                assertEquals(2, ndx
+                        .count("bro", languageCode, true/* prefixMatch */));
 
             }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.