You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/01/06 12:09:44 UTC
svn commit: r1555715 - in /lucene/dev/trunk: ./ lucene/ lucene/facet/
lucene/facet/src/java/org/apache/lucene/facet/range/
lucene/facet/src/test/org/apache/lucene/facet/range/
Author: mikemccand
Date: Mon Jan 6 11:09:43 2014
New Revision: 1555715
URL: http://svn.apache.org/r1555715
Log:
fix test bug; remove dead code
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/facet/ (props changed)
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java
lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java?rev=1555715&r1=1555714&r2=1555715&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java Mon Jan 6 11:09:43 2014
@@ -78,14 +78,6 @@ public class DoubleRangeFacetCounts exte
LongRangeCounter counter = new LongRangeCounter(longRanges);
- // Compute min & max over all ranges:
- double minIncl = Double.POSITIVE_INFINITY;
- double maxIncl = Double.NEGATIVE_INFINITY;
- for(DoubleRange range : ranges) {
- minIncl = Math.min(minIncl, range.minIncl);
- maxIncl = Math.max(maxIncl, range.maxIncl);
- }
-
int missingCount = 0;
for (MatchingDocs hits : matchingDocs) {
FunctionValues fv = valueSource.getValues(Collections.emptyMap(), hits.context);
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java?rev=1555715&r1=1555714&r2=1555715&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java Mon Jan 6 11:09:43 2014
@@ -57,14 +57,6 @@ public class LongRangeFacetCounts extend
LongRange[] ranges = (LongRange[]) this.ranges;
- // Compute min & max over all ranges:
- long minIncl = Long.MAX_VALUE;
- long maxIncl = Long.MIN_VALUE;
- for(LongRange range : ranges) {
- minIncl = Math.min(minIncl, range.minIncl);
- maxIncl = Math.max(maxIncl, range.maxIncl);
- }
-
LongRangeCounter counter = new LongRangeCounter(ranges);
int missingCount = 0;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java?rev=1555715&r1=1555714&r2=1555715&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java Mon Jan 6 11:09:43 2014
@@ -40,10 +40,6 @@ import org.apache.lucene.facet.FacetsCon
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.facet.MultiFacets;
import org.apache.lucene.facet.DrillSideways.DrillSidewaysResult;
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.facet.range.DoubleRangeFacetCounts;
-import org.apache.lucene.facet.range.LongRange;
-import org.apache.lucene.facet.range.LongRangeFacetCounts;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -507,6 +503,9 @@ public class TestRangeFacetCounts extend
int numRange = _TestUtil.nextInt(random(), 1, 5);
DoubleRange[] ranges = new DoubleRange[numRange];
int[] expectedCounts = new int[numRange];
+ if (VERBOSE) {
+ System.out.println("TEST: " + numRange + " ranges");
+ }
for(int rangeID=0;rangeID<numRange;rangeID++) {
double min;
if (rangeID > 0 && random().nextInt(10) == 7) {
@@ -539,6 +538,12 @@ public class TestRangeFacetCounts extend
max = x;
}
+ // Must truncate to float precision so that the
+ // drill-down counts (which use NRQ.newFloatRange)
+ // are correct:
+ min = (double) (float) min;
+ max = (double) (float) max;
+
boolean minIncl;
boolean maxIncl;
if (min == max) {
@@ -550,6 +555,10 @@ public class TestRangeFacetCounts extend
}
ranges[rangeID] = new DoubleRange("r" + rangeID, min, minIncl, max, maxIncl);
+ if (VERBOSE) {
+ System.out.println("TEST: range " + rangeID + ": " + ranges[rangeID]);
+ }
+
// Do "slow but hopefully correct" computation of
// expected count:
for(int i=0;i<numDocs;i++) {
@@ -564,6 +573,9 @@ public class TestRangeFacetCounts extend
} else {
accept &= values[i] < max;
}
+ if (VERBOSE) {
+ System.out.println("TEST: check doc=" + i + " val=" + values[i] + " accept=" + accept);
+ }
if (accept) {
expectedCounts[rangeID]++;
}
@@ -577,7 +589,7 @@ public class TestRangeFacetCounts extend
assertEquals(numRange, result.labelValues.length);
for(int rangeID=0;rangeID<numRange;rangeID++) {
if (VERBOSE) {
- System.out.println(" range " + rangeID + " expectedCount=" + expectedCounts[rangeID]);
+ System.out.println("TEST: verify range " + rangeID + " expectedCount=" + expectedCounts[rangeID]);
}
LabelAndValue subNode = result.labelValues[rangeID];
assertEquals("r" + rangeID, subNode.label);