Merge branch 'hotfix/1.4.1'

tzok · Oct 25, 2018 · b4992d8 · b4992d8
2 parents 272dc3c + ddb6590
commit b4992d8
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 20 deletions.
diff --git a/mcq-cli/global b/mcq-cli/global
@@ -1,2 +1,2 @@
 #! /bin/bash
-exec java -cp $(dirname $0)/target/mcq-cli-1.4-SNAPSHOT-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Global $@
+exec java -cp $(dirname $0)/target/mcq-cli-1.4.1-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Global $@
diff --git a/mcq-cli/lcs b/mcq-cli/lcs
@@ -1,2 +1,2 @@
 #! /bin/bash
-exec java -cp $(dirname $0)/target/mcq-cli-1.4-SNAPSHOT-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Lcs $@
+exec java -cp $(dirname $0)/target/mcq-cli-1.4.1-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Lcs $@
diff --git a/mcq-cli/local b/mcq-cli/local
@@ -1,2 +1,2 @@
 #! /bin/bash
-exec java -cp $(dirname $0)/target/mcq-cli-1.4-SNAPSHOT-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Local $@
+exec java -cp $(dirname $0)/target/mcq-cli-1.4.1-jar-with-dependencies.jar pl.poznan.put.mcq.cli.Local $@
diff --git a/mcq-cli/pom.xml b/mcq-cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mcq-parent</artifactId>
     <groupId>pl.poznan.put</groupId>
-    <version>1.4</version>
+    <version>1.4.1</version>
   </parent>
 
   <artifactId>mcq-cli</artifactId>

diff --git a/mcq-cli/src/main/java/pl/poznan/put/mcq/cli/Global.java b/mcq-cli/src/main/java/pl/poznan/put/mcq/cli/Global.java
@@ -68,7 +68,7 @@ private Global() {
   private static final class Listener implements ParallelGlobalComparator.ProgressListener {
     private final ProgressBar progressBar;
 
-    public Listener(final ProgressBar progressBar) {
+    private Listener(final ProgressBar progressBar) {
       super();
       this.progressBar = progressBar;
     }
@@ -80,20 +80,25 @@ public void setProgress(final int progress) {
 
     @Override
     public void complete(final GlobalMatrix matrix) {
-      progressBar.close();
-
-      final PrototypeBasedClusterer clusterer = new KMedoids();
-      final double[][] rawMatrix = matrix.getDistanceMatrix().getMatrix();
-      final ScoredClusteringResult clustering =
-          KScanner.parallelScan(clusterer, rawMatrix, PAM.getInstance());
-      final PartitionalClustering partitionalClustering =
-          new PartitionalClustering(matrix.getDistanceMatrix(), clustering);
-
       try {
+        progressBar.close();
+
         final File directory = ExecHelper.createRandomDirectory();
         Listener.exportResults(directory, matrix);
-        Listener.exportDrawing(directory, partitionalClustering);
-        Listener.exportClustering(directory, partitionalClustering);
+
+        final double[][] rawMatrix = matrix.getDistanceMatrix().getMatrix();
+
+        if (rawMatrix.length > 2) {
+          final PrototypeBasedClusterer clusterer = new KMedoids();
+          final ScoredClusteringResult clustering =
+              KScanner.parallelScan(clusterer, rawMatrix, PAM.getInstance());
+          final PartitionalClustering partitionalClustering =
+              new PartitionalClustering(matrix.getDistanceMatrix(), clustering);
+
+          Listener.exportDrawing(directory, partitionalClustering);
+          Listener.exportClustering(directory, partitionalClustering);
+        }
+
         System.out.println("Results available in: " + directory);
       } catch (final IOException e) {
         System.err.println("Failed to store results");

diff --git a/mcq-clustering/pom.xml b/mcq-clustering/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mcq-parent</artifactId>
     <groupId>pl.poznan.put</groupId>
-    <version>1.4</version>
+    <version>1.4.1</version>
   </parent>
 
   <artifactId>mcq-clustering</artifactId>

diff --git a/mcq-core/pom.xml b/mcq-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mcq-parent</artifactId>
     <groupId>pl.poznan.put</groupId>
-    <version>1.4</version>
+    <version>1.4.1</version>
   </parent>
 
   <artifactId>mcq-core</artifactId>

diff --git a/mcq-gui/pom.xml b/mcq-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mcq-parent</artifactId>
     <groupId>pl.poznan.put</groupId>
-    <version>1.4</version>
+    <version>1.4.1</version>
   </parent>
 
   <artifactId>mcq-gui</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>pl.poznan.put</groupId>
   <artifactId>mcq-parent</artifactId>
-  <version>1.4</version>
+  <version>1.4.1</version>
   <packaging>pom</packaging>
 
   <modules>