Merge pull request #54 from allan-shoup/system-exit

Converted System.exit to throw exceptions, cleaned up leaked …

Author: gpapadis

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

@@ -107,7 +107,7 @@ public int getTotalNoOfEntities() {
         if (entityProfilesD2 == null) {
             return noOfEntitiesD1;
         }
-        return noOfEntitiesD1 + noOfEntitiesD2;
+        return Math.addExact(noOfEntitiesD1, noOfEntitiesD2);
     }
 
     protected void indexEntities(Map<String, TIntList> index, List<EntityProfile> entities) {

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

@@ -36,6 +36,6 @@ protected void printOriginalStatistics(List<AbstractBlock> inputBlocks) {
         }
 
         Log.info("Original blocks\t:\t" + inputBlocks.size());
-        Log.info("Original comparisons\t:\t" + ((long)comparisons));
+        Log.info("Original comparisons\t:\t" + comparisons);
     }
 }

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

@@ -105,10 +105,10 @@ protected void getBilateralLimits(List<AbstractBlock> blocks) {
         });
 
         for (int i = 0; i < limitsD1.length; i++) {
-            limitsD1[i] = (int) Math.round(ratio * limitsD1[i]);
+            limitsD1[i] = Math.round(ratio * limitsD1[i]);
         }
         for (int i = 0; i < limitsD2.length; i++) {
-            limitsD2[i] = (int) Math.round(ratio * limitsD2[i]);
+            limitsD2[i] = Math.round(ratio * limitsD2[i]);
         }
     }
 
@@ -193,7 +193,7 @@ protected void getUnilateralLimits(List<AbstractBlock> blocks) {
         });
 
         for (int i = 0; i < limitsD1.length; i++) {
-            limitsD1[i] = (int) Math.round(ratio * limitsD1[i]);
+            limitsD1[i] = Math.round(ratio * limitsD1[i]);
         }
     }
 

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

@@ -63,7 +63,7 @@ private int getMaxBlockSize(List<AbstractBlock> blocks) {
             entities.addAll(uBlock.getEntities());
         });
 
-        return (int) Math.round(entities.size()*purgingFactor);
+        return Math.round(entities.size()*purgingFactor);
     }
 
     private int getMaxInnerBlockSize(List<AbstractBlock> blocks) {
@@ -76,7 +76,7 @@ private int getMaxInnerBlockSize(List<AbstractBlock> blocks) {
             d2Entities.addAll(bBlock.getIndex2Entities());
         });
 
-        return (int) Math.round(Math.min(d1Entities.size(), d2Entities.size())*purgingFactor);
+        return Math.round(Math.min(d1Entities.size(), d2Entities.size())*purgingFactor);
     }
 
     @Override

src/main/java/org/scify/jedai/blockprocessing/comparisoncleaning/CanopyClustering.java

@@ -15,7 +15,6 @@
  */
 package org.scify.jedai.blockprocessing.comparisoncleaning;
 
-import com.esotericsoftware.minlog.Log;
 import org.scify.jedai.datamodel.AbstractBlock;
 import org.scify.jedai.utilities.enumerations.WeightingScheme;
 import gnu.trove.iterator.TIntIterator;
@@ -56,8 +55,8 @@ public CanopyClustering(float inThr, float outThr, WeightingScheme scheme) {
         exclusiveThreshold = outThr;
         inclusiveThreshold = inThr;
         if (exclusiveThreshold < inclusiveThreshold) {
-            Log.error(getMethodName(), "The " + getParameterName(1) + " cannot be smaller than the " + getParameterName(0));
-            System.exit(-1);
+            throw new IllegalStateException(
+                "The " + getParameterName(1) + " cannot be smaller than the " + getParameterName(0));
         }
     }
 

src/main/java/org/scify/jedai/blockprocessing/comparisoncleaning/ExtendedCanopyClustering.java

@@ -15,7 +15,6 @@
  */
 package org.scify.jedai.blockprocessing.comparisoncleaning;
 
-import com.esotericsoftware.minlog.Log;
 import org.scify.jedai.datamodel.AbstractBlock;
 import org.scify.jedai.datamodel.Comparison;
 import org.scify.jedai.utilities.enumerations.WeightingScheme;
@@ -60,8 +59,7 @@ public ExtendedCanopyClustering(int inThr, int outThr, WeightingScheme scheme) {
         exclusiveThreshold = outThr;
         inclusiveThreshold = inThr;
         if (inclusiveThreshold < exclusiveThreshold) {
-            Log.error(getMethodName(), "The Exclusive Threshold cannot be larger than the Inclusive one.");
-            System.exit(-1);
+            throw new IllegalStateException("The Exclusive Threshold cannot be larger than the Inclusive one.");
         }
     }
 
@@ -133,7 +131,7 @@ protected List<AbstractBlock> pruneEdges() {
 
         excludedEntities = new TIntHashSet();
         nearestEntities = new HashSet[noOfEntities];
-        topKEdges = new PriorityQueue<>((int) (2 * inclusiveThreshold), new IncComparisonWeightComparator());
+        topKEdges = new PriorityQueue<>(2 * inclusiveThreshold, new IncComparisonWeightComparator());
         if (weightingScheme.equals(WeightingScheme.ARCS)) {
             while (iterator.hasNext()) {
                 int currentId = iterator.next();

src/main/java/org/scify/jedai/configuration/randomsearch/AbstractRandomSearchConfiguration.java

@@ -27,10 +27,10 @@ public abstract class AbstractRandomSearchConfiguration implements IRandomSearch
 
     protected final static Random RANDOM_GEN = new Random();
 
-    protected final List selectedRandomValues;
+    protected final List<Object> selectedRandomValues;
 
     public AbstractRandomSearchConfiguration() {
-        selectedRandomValues = new ArrayList();
+        selectedRandomValues = new ArrayList<>();
     }
 
     @Override

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

@@ -65,7 +65,6 @@ public int getEntityId2() {
     /**
      * Returns the measure of the weight or similarity between two entities.
      * Higher utility measures correspond to greater weight or stronger similarity.
-     * @return 
      */
     public float getUtilityMeasure() {
         return utilityMeasure;

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

@@ -90,7 +90,7 @@ public SimpleGraph<Integer, DefaultEdge> MinCutTree() {
 
             final Set<V> sourcePartition = minSourceSinkCut.getSourcePartition();
 //            float flowValue = minSourceSinkCut.getCutWeight();
-            DefaultWeightedEdge e = (DefaultWeightedEdge) returnGraphClone.addEdge(vertex, predecessor);
+            DefaultWeightedEdge e = returnGraphClone.addEdge(vertex, predecessor);
             returnGraph.addEdge(Integer.parseInt(vertex + ""), Integer.parseInt(predecessor + ""));
             returnGraphClone.setEdgeWeight(e, flowValue);
 

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

@@ -15,9 +15,7 @@
  */
 package org.scify.jedai.datamodel;
 
-import com.esotericsoftware.minlog.Log;
 import java.io.Serializable;
-
 import java.util.List;
 import org.scify.jedai.utilities.IConstants;
 
@@ -64,10 +62,9 @@ private long countComparisons(List<AbstractBlock> blocks) {
             comparisons += block.getNoOfComparisons();
         }
 
-        if (MAX_COMPARISONS < comparisons) {
-            Log.error("Very high number of comparisons to be executed! "
-                    + "Maximum allowed number is : " + MAX_COMPARISONS);
-            System.exit(-1);
+        if (comparisons > MAX_COMPARISONS) {
+            throw new IllegalStateException("Very high number of comparisons to be executed. "
+                + "Maximum allowed number is : " + MAX_COMPARISONS);
         }
         return comparisons;
     }