tdlight-team/common-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update pom.xml, CompletableFutureUtils.java, and FloatPriorityQueue.java

Browse Source
This commit is contained in:
Andrea Cavalli 2020-09-30 22:43:53 +02:00
parent 37bbafdfbf
commit 0d566b88b0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -68,7 +68,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>17.0.0</version>
<version>19.0.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

4
src/main/java/org/warp/commonutils/concurrency/future/CompletableFutureUtils.java
View File

@ -184,8 +184,8 @@ public class CompletableFutureUtils {
public static <T> CompletableFuture<FloatPriorityQueue<T>> aggregatePq(Collection<CompletableFuture<FloatPriorityQueue<T>>> futureFloatPriorityQueues) {
final CompletableFuture<FloatPriorityQueue<T>> identityAggregatedResult = CompletableFuture.completedFuture(new FloatPriorityQueue<>());
return futureFloatPriorityQueues.parallelStream().reduce(identityAggregatedResult, (currentAggregatedResult, futureFloatPriorityQueue) -> {
return currentAggregatedResult.thenApplyAsync((aggregatedFloatPriorityQueue) -> {
return futureFloatPriorityQueues.stream().reduce(identityAggregatedResult, (currentAggregatedResult, futureFloatPriorityQueue) -> {
return currentAggregatedResult.thenApply((aggregatedFloatPriorityQueue) -> {
var futureFloatPriorityQueueValues = futureFloatPriorityQueue.join();
if (futureFloatPriorityQueueValues == aggregatedFloatPriorityQueue) {
return aggregatedFloatPriorityQueue;

4
src/main/java/org/warp/commonutils/type/FloatPriorityQueue.java
View File

@ -224,7 +224,9 @@ public class FloatPriorityQueue<T> implements Queue<T> {
}
public boolean offer(ScoredValue<T> value) {
assert contentValues.size() == internalQueue.size();
int contentValuesSize = contentValues.size();
int internalQueueSize = internalQueue.size();
assert contentValuesSize == internalQueueSize;
boolean added = true;
float oldValue;