Added main method for running JedAI through command line. Fixed minor…

… bugs.
scify · Mar 9, 2018 · baa0961 · baa0961
1 parent b602d84
commit baa0961
Show file tree

Hide file tree

Showing 10 changed files with 371 additions and 10 deletions.
diff --git a/jedai-core/src/main/java/org/scify/jedai/blockprocessing/AbstractBlockProcessing.java b/jedai-core/src/main/java/org/scify/jedai/blockprocessing/AbstractBlockProcessing.java
@@ -35,7 +35,7 @@ protected void printOriginalStatistics(List<AbstractBlock> inputBlocks) {
             comparisons+= block.getNoOfComparisons();
         }
 
-        Log.info("Original blocks\t:\t{0}" + inputBlocks.size());
+        Log.info("Original blocks\t:\t" + inputBlocks.size());
         Log.info("Original comparisons\t:\t" + comparisons);
     }
 }
diff --git a/...ore/src/main/java/org/scify/jedai/blockprocessing/blockcleaning/AbstractBlockPurging.java b/...ore/src/main/java/org/scify/jedai/blockprocessing/blockcleaning/AbstractBlockPurging.java
@@ -46,7 +46,7 @@ public List<AbstractBlock> refineBlocks(List<AbstractBlock> blocks) {
         final Iterator<AbstractBlock> blocksIterator = blocks.iterator();
         while (blocksIterator.hasNext()) {
             AbstractBlock aBlock = blocksIterator.next();
-            if (satisfiesThreshold(aBlock)) {
+            if (!satisfiesThreshold(aBlock)) {
                 noOfPurgedBlocks++;
                 blocksIterator.remove();
             } else {

diff --git a/jedai-core/src/main/java/org/scify/jedai/utilities/BlocksPerformance.java b/jedai-core/src/main/java/org/scify/jedai/utilities/BlocksPerformance.java
@@ -272,7 +272,7 @@ private void setComparisonsCardinality() {
 
     public void setStatistics() {
         if (blocks.isEmpty()) {
-            Log.warn("Empty set of equivalence clusters given as input!");
+            Log.warn("Empty set of blocks was given as input!");
             return;
         }
 

diff --git a/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/BlockBuildingMethod.java b/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/BlockBuildingMethod.java
@@ -40,8 +40,8 @@ public enum BlockBuildingMethod {
     EXTENDED_SUFFIX_ARRAYS,
     Q_GRAMS_BLOCKING,
     SORTED_NEIGHBORHOOD,
-    SUFFIX_ARRAYS,
-    STANDARD_BLOCKING;
+    STANDARD_BLOCKING,
+    SUFFIX_ARRAYS;
 
     public static IBlockBuilding getDefaultConfiguration(BlockBuildingMethod blbuMethod) {
         switch (blbuMethod) {

diff --git a/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/BlockCleaningMethod.java b/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/BlockCleaningMethod.java
@@ -1,5 +1,5 @@
 /*
-* Copyright [2016-2017] [George Papadakis ([email protected])]
+* Copyright [2016-2018] [George Papadakis ([email protected])]
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/...i-core/src/main/java/org/scify/jedai/utilities/enumerations/ComparisonCleaningMethod.java b/...i-core/src/main/java/org/scify/jedai/utilities/enumerations/ComparisonCleaningMethod.java
@@ -1,5 +1,5 @@
 /*
-* Copyright [2016-2017] [George Papadakis ([email protected])]
+* Copyright [2016-2018] [George Papadakis ([email protected])]
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/...core/src/main/java/org/scify/jedai/utilities/enumerations/EntityClusteringCcerMethod.java b/...core/src/main/java/org/scify/jedai/utilities/enumerations/EntityClusteringCcerMethod.java
@@ -1,5 +1,5 @@
 /*
-* Copyright [2016-2017] [George Papadakis ([email protected])]
+* Copyright [2016-2018] [George Papadakis ([email protected])]
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/...-core/src/main/java/org/scify/jedai/utilities/enumerations/EntityClusteringDerMethod.java b/...-core/src/main/java/org/scify/jedai/utilities/enumerations/EntityClusteringDerMethod.java
@@ -1,5 +1,5 @@
 /*
-* Copyright [2016-2017] [George Papadakis ([email protected])]
+* Copyright [2016-2018] [George Papadakis ([email protected])]
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/EntityMatchingMethod.java b/jedai-core/src/main/java/org/scify/jedai/utilities/enumerations/EntityMatchingMethod.java
@@ -1,5 +1,5 @@
 /*
-* Copyright [2016-2017] [George Papadakis ([email protected])]
+* Copyright [2016-2018] [George Papadakis ([email protected])]
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.