-
Notifications
You must be signed in to change notification settings - Fork 544
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
424 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
roaringbitmap/src/main/java/org/roaringbitmap/PeekableIntRankIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package org.roaringbitmap; | ||
|
||
/** | ||
* PeekableIntIterator that calculates the next value rank during iteration | ||
*/ | ||
public interface PeekableIntRankIterator extends PeekableIntIterator { | ||
/** | ||
* Look at rank of the next value without advancing | ||
* | ||
* @return rank of next value | ||
*/ | ||
int peekNextRank(); | ||
|
||
@Override | ||
PeekableIntRankIterator clone(); | ||
} | ||
|
||
|
16 changes: 16 additions & 0 deletions
16
roaringbitmap/src/main/java/org/roaringbitmap/PeekableShortRankIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.roaringbitmap; | ||
|
||
/** | ||
* PeekableShortIterator that calculates the next value rank during iteration | ||
*/ | ||
public interface PeekableShortRankIterator extends PeekableShortIterator { | ||
|
||
/** | ||
* peek in-container rank of the next value | ||
* @return rank of the next value | ||
*/ | ||
short peekNextRank(); | ||
|
||
@Override | ||
PeekableShortRankIterator clone(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
roaringbitmap/src/test/java/org/roaringbitmap/TestRankIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package org.roaringbitmap; | ||
|
||
import org.junit.Assert; | ||
import org.junit.Test; | ||
|
||
public class TestRankIterator { | ||
private void testBitmapRanksOnNext(FastRankRoaringBitmap bm) { | ||
PeekableIntRankIterator iterator = bm.getIntRankIterator(); | ||
while (iterator.hasNext()) { | ||
int bit = iterator.peekNext(); | ||
int rank = iterator.peekNextRank(); | ||
int slowRank = bm.rank(bit); | ||
Assert.assertEquals(slowRank, rank); | ||
|
||
iterator.next(); | ||
} | ||
} | ||
|
||
@Test | ||
public void randomizedTest() { | ||
RoaringBitmap bm = RandomisedTestData.randomBitmap(1 << 12); | ||
FastRankRoaringBitmap fast = new FastRankRoaringBitmap(); | ||
fast.or(bm); | ||
fast.runOptimize(); | ||
|
||
Assert.assertTrue(fast.isCacheDismissed()); | ||
|
||
testBitmapRanksOnNext(fast); | ||
} | ||
} |
Oops, something went wrong.