andi/primitive-collections
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix LongLongHashMap.forEachOrdered for negative values

Browse Source
This commit is contained in:
Andreas Huber
2019-09-07 16:51:30 +02:00
parent 4d92197423
commit 452ef2020d
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
primitiveCollections/src/main/java/org/lucares/collections/LongLongHashMap.java
View File

@@ -283,6 +283,9 @@ public class LongLongHashMap {
consumer.accept(key, get(key)); consumer.accept(key, get(key));
} else if (key == EMPTY_SLOT) { } else if (key == EMPTY_SLOT) {
final int posFirstKey = findPosOfFirstPositiveKey(sortedKeys); final int posFirstKey = findPosOfFirstPositiveKey(sortedKeys);
if (posFirstKey < 0) {
return;
}
i = posFirstKey - 1; i = posFirstKey - 1;
} }
} }

48
primitiveCollections/src/test/java/org/lucares/collections/LongLongHashMapTest.java
View File

@@ -131,6 +131,54 @@ public class LongLongHashMapTest {
actualOrderOfKeys.add(k); actualOrderOfKeys.add(k);
}); });
Assertions.assertTrue(actualOrderOfKeys.isSorted(), "keys are sorted");
Assertions.assertEquals(LongList.intersection(actualOrderOfKeys, entries).size(), entries.size(),
"all keys were visited");
final LongList additionalKeys = new LongList(actualOrderOfKeys);
additionalKeys.removeAll(entries);
Assertions.assertEquals(additionalKeys, LongList.of(), "no additional keys were visited");
}
@Test
public void testForEachOrderedOnlyNegativeValues() {
final LongLongHashMap map = new LongLongHashMap();
final LongList entries = LongList.of(LongStream.range(-20, -5).toArray());
entries.stream().forEachOrdered(l -> {
map.put(l, 2 * l);
});
final LongList actualOrderOfKeys = new LongList();
map.forEachOrdered((k, v) -> {
Assertions.assertEquals(k * 2, v, "value is key*2");
Assertions.assertTrue(entries.indexOf(k) >= 0, "value " + k + " in entries: " + entries);
actualOrderOfKeys.add(k);
});
Assertions.assertTrue(actualOrderOfKeys.isSorted(), "keys are sorted");
Assertions.assertEquals(LongList.intersection(actualOrderOfKeys, entries).size(), entries.size(),
"all keys were visited");
final LongList additionalKeys = new LongList(actualOrderOfKeys);
additionalKeys.removeAll(entries);
Assertions.assertEquals(additionalKeys, LongList.of(), "no additional keys were visited");
}
@Test
public void testForEachOrderedOnlyNegativeValues2() {
final LongLongHashMap map = new LongLongHashMap();
final LongList entries = LongList.of(LongStream.range(-20, -5).toArray());
entries.stream().forEachOrdered(l -> {
map.put(l, 2 * l);
});
final LongList actualOrderOfKeys = new LongList();
map.forEachOrdered((k, v) -> {
Assertions.assertEquals(k * 2, v, "value is key*2");
Assertions.assertTrue(entries.indexOf(k) >= 0, "value " + k + " in entries: " + entries);
actualOrderOfKeys.add(k);
});
Assertions.assertTrue(actualOrderOfKeys.isSorted(), "keys are sorted"); Assertions.assertTrue(actualOrderOfKeys.isSorted(), "keys are sorted");
} }