Skip to content

Commit 94ea20e

Browse files
committed
Minor changes.
1 parent eb8d063 commit 94ea20e

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

src/main/java/org/scify/jedai/blockprocessing/AbstractBlockProcessing.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030
public abstract class AbstractBlockProcessing implements IBlockProcessing {
3131

3232
protected void printOriginalStatistics(List<AbstractBlock> inputBlocks) {
33-
long comparisons = 0;
34-
for (AbstractBlock block : inputBlocks) {
35-
comparisons += block.getNoOfComparisons();
36-
}
33+
long comparisons = inputBlocks.stream().mapToLong(AbstractBlock::getNoOfComparisons).sum();
3734

3835
Log.info("Original blocks\t:\t" + inputBlocks.size());
3936
Log.info("Original comparisons\t:\t" + comparisons);

src/main/java/org/scify/jedai/blockprocessing/blockcleaning/AbstractBlockPurging.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public List<AbstractBlock> refineBlocks(List<AbstractBlock> blocks) {
4949
setThreshold(newBlocks);
5050

5151
int noOfPurgedBlocks = 0;
52-
float totalComparisons = 0;
52+
long totalComparisons = 0;
5353
final Iterator<AbstractBlock> blocksIterator = newBlocks.iterator();
5454
while (blocksIterator.hasNext()) {
5555
AbstractBlock aBlock = blocksIterator.next();

src/main/java/org/scify/jedai/datamodel/SimilarityPairs.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ public void addComparison(Comparison comparison) {
5757
}
5858

5959
private long countComparisons(List<AbstractBlock> blocks) {
60-
long comparisons = 0;
61-
for (AbstractBlock block : blocks) {
62-
comparisons += block.getNoOfComparisons();
63-
}
60+
long comparisons = blocks.stream().mapToLong(AbstractBlock::getNoOfComparisons).sum();
6461

6562
if (comparisons > MAX_COMPARISONS) {
6663
throw new IllegalStateException("Very high number of comparisons to be executed. "

0 commit comments

Comments
 (0)