Changed comparison counters to long/int (again).

Author: gpapadis

src/main/java/org/scify/jedai/blockbuilding/AbstractBlockBuilding.java

@@ -30,8 +30,8 @@ public abstract class AbstractBlockBuilding implements IBlockBuilding {
 
     protected boolean isUsingEntropy;
 
-    protected float noOfEntitiesD1;
-    protected float noOfEntitiesD2;
+    protected int noOfEntitiesD1;
+    protected int noOfEntitiesD2;
 
     protected List<AbstractBlock> blocks;
     protected List<EntityProfile> entityProfilesD1;
@@ -96,14 +96,14 @@ public List<AbstractBlock> getBlocks(List<EntityProfile> profilesD1, List<Entity
         return readBlocks();
     }
 
-    public float getBruteForceComparisons() {
+    public long getBruteForceComparisons() {
         if (entityProfilesD2 == null) {
             return noOfEntitiesD1 * (noOfEntitiesD1 - 1) / 2;
         }
         return noOfEntitiesD1 * noOfEntitiesD2;
     }
 
-    public float getTotalNoOfEntities() {
+    public int getTotalNoOfEntities() {
         if (entityProfilesD2 == null) {
             return noOfEntitiesD1;
         }

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

@@ -30,10 +30,12 @@
 public abstract class AbstractBlockProcessing implements IBlockProcessing {
 
     protected void printOriginalStatistics(List<AbstractBlock> inputBlocks) {
-        float comparisons = 0;
-        comparisons = inputBlocks.stream().map((block) -> block.getNoOfComparisons()).reduce(comparisons, (accumulator, _item) -> accumulator + _item);
+        long comparisons = 0;
+        for (AbstractBlock block : inputBlocks) {
+            comparisons += block.getNoOfComparisons();
+        }
 
         Log.info("Original blocks\t:\t" + inputBlocks.size());
-        Log.info("Original comparisons\t:\t" + comparisons);
+        Log.info("Original comparisons\t:\t" + ((long)comparisons));
     }
 }

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

@@ -31,7 +31,7 @@ public abstract class AbstractBlock implements Serializable {
 
     protected int blockIndex;
 
-    protected float comparisons;
+    protected long comparisons;
     protected float entropy;
     protected float utilityMeasure;
 
@@ -53,7 +53,7 @@ public float getEntropy() {
         return entropy;
     }
 
-    public float getNoOfComparisons() {
+    public long getNoOfComparisons() {
         return comparisons;
     }
 
@@ -77,6 +77,6 @@ public List<Comparison> getComparisons() {
         return comparisonsList;
     }
 
-    public abstract float getTotalBlockAssignments();
+    public abstract int getTotalBlockAssignments();
     public abstract void setUtilityMeasure();
 }

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

@@ -39,7 +39,7 @@ public BilateralBlock(float entropy, int[] entities1, int[] entities2) {
         super(entropy);
         index1Entities = entities1;
         index2Entities = entities2;
-        comparisons = ((float) index1Entities.length) * ((float) index2Entities.length);
+        comparisons = ((long) index1Entities.length) * index2Entities.length;
     }
 
     @Override
@@ -66,7 +66,7 @@ public int[] getIndex2Entities() {
     }
 
     @Override
-    public float getTotalBlockAssignments() {
+    public int getTotalBlockAssignments() {
         return index1Entities.length+index2Entities.length;
     }
 

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

@@ -26,8 +26,8 @@
  */
 public class ComparisonIterator implements IConstants, Iterator<Comparison> {
 
-    private float executedComparisons;
-    private final float totalComparisons;
+    private long executedComparisons;
+    private final long totalComparisons;
 
     private int innerLoop;
     private int innerLimit;

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

@@ -60,12 +60,12 @@ public int[] getEntities2() {
     }
 
     @Override
-    public float getNoOfComparisons() {
+    public long getNoOfComparisons() {
         return entities1.length;
     }
 
     @Override
-    public float getTotalBlockAssignments() {
+    public int getTotalBlockAssignments() {
         return 2*entities1.length;
     }
 

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

@@ -28,7 +28,9 @@
 public class SimilarityPairs implements IConstants, Serializable {
 
     private final boolean isCleanCleanER;
+    
     private int currentIndex;
+    
     private final float[] similarities;
     private final int[] entityIds1;
     private final int[] entityIds2;
@@ -44,7 +46,7 @@ public SimilarityPairs(boolean ccer, int comparisons) {
     public SimilarityPairs(boolean ccer, List<AbstractBlock> blocks) {
         currentIndex = 0;
         isCleanCleanER = ccer;
-        float totalComparisons = countComparisons(blocks);
+        long totalComparisons = countComparisons(blocks);
         entityIds1 = new int[(int) totalComparisons];
         entityIds2 = new int[(int) totalComparisons];
         similarities = new float[(int) totalComparisons];
@@ -53,12 +55,14 @@ public SimilarityPairs(boolean ccer, List<AbstractBlock> blocks) {
     public void addComparison(Comparison comparison) {
         entityIds1[currentIndex] = comparison.getEntityId1();
         entityIds2[currentIndex] = comparison.getEntityId2();
-        similarities[currentIndex++] = (float) comparison.getUtilityMeasure();
+        similarities[currentIndex++] = comparison.getUtilityMeasure();
     }
 
-    private float countComparisons(List<AbstractBlock> blocks) {
-        float comparisons = 0;
-        comparisons = blocks.stream().map((block) -> block.getNoOfComparisons()).reduce(comparisons, (accumulator, _item) -> accumulator + _item);
+    private long countComparisons(List<AbstractBlock> blocks) {
+        long comparisons = 0;
+        for (AbstractBlock block : blocks) {
+            comparisons += block.getNoOfComparisons();
+        }
 
         if (MAX_COMPARISONS < comparisons) {
             Log.error("Very high number of comparisons to be executed! "

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

@@ -37,7 +37,7 @@ public UnilateralBlock(int[] entities) {
     public UnilateralBlock(float entropy, int[] entities) {
         super(entropy);
         this.entities = entities;
-        comparisons = entities.length*(entities.length-1.0f)/2.0f;
+        comparisons = ((long)entities.length)*(entities.length-1)/2;
     }
 
     @Override
@@ -57,7 +57,7 @@ public int[] getEntities() {
     }
 
     @Override
-    public float getTotalBlockAssignments() {
+    public int getTotalBlockAssignments() {
         return entities.length;
     }
 

src/main/java/org/scify/jedai/textmodels/BagModel.java

@@ -86,8 +86,8 @@ protected float getJaccardSimilarity(BagModel oModel) {
         final Set<String> commonKeys = new HashSet<>(itemsFrequency.keySet());
         commonKeys.retainAll(oModel.getItemsFrequency().keySet());
 
-        int numerator = commonKeys.size();
-        int denominator = itemsFrequency.size() + oModel.getItemsFrequency().size() - numerator;
+        float numerator = commonKeys.size();
+        float denominator = itemsFrequency.size() + oModel.getItemsFrequency().size() - numerator;
         return numerator / denominator;
     }
 

src/main/java/org/scify/jedai/utilities/BlocksPerformance.java

@@ -345,7 +345,7 @@ public void printFalseNegatives(List<EntityProfile> profilesD1, List<EntityProfi
         pw.close();
     }
 
-    public void printStatistics(float overheadTime, String methodConfiguration, String methodName) {
+    public void printStatistics(long overheadTime, String methodConfiguration, String methodName) {
         if (blocks.isEmpty()) {
             return;
         }