Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-8758 Remove unused fields in QuadPrefixTree

This commit is contained in:
Amish Shah 2019-08-30 10:14:27 -04:00 committed by David Smiley
parent 52be32d4ad
commit ea67d9c8c6
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -131,6 +131,8 @@ Other
* LUCENE-8778 LUCENE-8911 LUCENE-8957: Define analyzer SPI names as static final fields and document the names in Javadocs. * LUCENE-8778 LUCENE-8911 LUCENE-8957: Define analyzer SPI names as static final fields and document the names in Javadocs.
(Tomoko Uchida, Uwe Schindler) (Tomoko Uchida, Uwe Schindler)
* LUCENE-8758: QuadPrefixTree: removed levelS and levelN fields which weren't used. (Amish Shah)
======================= Lucene 8.2.0 ======================= ======================= Lucene 8.2.0 =======================
API Changes API Changes

11
lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
View File

@ -73,8 +73,6 @@ public class QuadPrefixTree extends LegacyPrefixTree {
final double[] levelW; final double[] levelW;
final double[] levelH; final double[] levelH;
final int[] levelS; // side
final int[] levelN; // number
protected boolean robust = true; // for backward compatibility, use the old method if user specified old version. protected boolean robust = true; // for backward compatibility, use the old method if user specified old version.
@ -88,8 +86,6 @@ public class QuadPrefixTree extends LegacyPrefixTree {
levelW = new double[maxLevels + 1]; levelW = new double[maxLevels + 1];
levelH = new double[maxLevels + 1]; levelH = new double[maxLevels + 1];
levelS = new int[maxLevels + 1];
levelN = new int[maxLevels + 1];
gridW = xmax - xmin; gridW = xmax - xmin;
gridH = ymax - ymin; gridH = ymax - ymin;
@ -97,14 +93,10 @@ public class QuadPrefixTree extends LegacyPrefixTree {
this.ymid = ymin + gridH/2.0; this.ymid = ymin + gridH/2.0;
levelW[0] = gridW/2.0; levelW[0] = gridW/2.0;
levelH[0] = gridH/2.0; levelH[0] = gridH/2.0;
levelS[0] = 2;
levelN[0] = 4;
for (int i = 1; i < levelW.length; i++) { for (int i = 1; i < levelW.length; i++) {
levelW[i] = levelW[i - 1] / 2.0; levelW[i] = levelW[i - 1] / 2.0;
levelH[i] = levelH[i - 1] / 2.0; levelH[i] = levelH[i - 1] / 2.0;
levelS[i] = levelS[i - 1] * 2;
levelN[i] = levelN[i - 1] * 4;
} }
} }
@ -129,8 +121,7 @@ public class QuadPrefixTree extends LegacyPrefixTree {
nf.setMinimumIntegerDigits(3); nf.setMinimumIntegerDigits(3);
for (int i = 0; i < maxLevels; i++) { for (int i = 0; i < maxLevels; i++) {
out.println(i + "]\t" + nf.format(levelW[i]) + "\t" + nf.format(levelH[i]) + "\t" + out.println(i + "]\t" + nf.format(levelW[i]) + "\t" + nf.format(levelH[i]));
levelS[i] + "\t" + (levelS[i] * levelS[i]));
} }
} }