Minor changes.

scify · Aug 27, 2021 · 94ea20e · 94ea20e
1 parent eb8d063
commit 94ea20e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/org/scify/jedai/blockprocessing/AbstractBlockProcessing.java b/src/main/java/org/scify/jedai/blockprocessing/AbstractBlockProcessing.java
@@ -30,10 +30,7 @@
 public abstract class AbstractBlockProcessing implements IBlockProcessing {
 
     protected void printOriginalStatistics(List<AbstractBlock> inputBlocks) {
-        long comparisons = 0;
-        for (AbstractBlock block : inputBlocks) {
-            comparisons += block.getNoOfComparisons();
-        }
+        long comparisons = inputBlocks.stream().mapToLong(AbstractBlock::getNoOfComparisons).sum();
 
         Log.info("Original blocks\t:\t" + inputBlocks.size());
         Log.info("Original comparisons\t:\t" + comparisons);

diff --git a/src/main/java/org/scify/jedai/blockprocessing/blockcleaning/AbstractBlockPurging.java b/src/main/java/org/scify/jedai/blockprocessing/blockcleaning/AbstractBlockPurging.java
@@ -49,7 +49,7 @@ public List<AbstractBlock> refineBlocks(List<AbstractBlock> blocks) {
         setThreshold(newBlocks);
 
         int noOfPurgedBlocks = 0;
-        float totalComparisons = 0;
+        long totalComparisons = 0;
         final Iterator<AbstractBlock> blocksIterator = newBlocks.iterator();
         while (blocksIterator.hasNext()) {
             AbstractBlock aBlock = blocksIterator.next();

diff --git a/src/main/java/org/scify/jedai/datamodel/SimilarityPairs.java b/src/main/java/org/scify/jedai/datamodel/SimilarityPairs.java
@@ -57,10 +57,7 @@ public void addComparison(Comparison comparison) {
     }
 
     private long countComparisons(List<AbstractBlock> blocks) {
-        long comparisons = 0;
-        for (AbstractBlock block : blocks) {
-            comparisons += block.getNoOfComparisons();
-        }
+        long comparisons = blocks.stream().mapToLong(AbstractBlock::getNoOfComparisons).sum();
 
         if (comparisons > MAX_COMPARISONS) {
             throw new IllegalStateException("Very high number of comparisons to be executed. "