hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomm...@apache.org
Subject svn commit: r1392772 - /hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java
Date Tue, 02 Oct 2012 07:38:15 GMT
Author: tommaso
Date: Tue Oct  2 07:38:14 2012
New Revision: 1392772

URL: http://svn.apache.org/viewvc?rev=1392772&view=rev
Log:
[HAMA-650] - fixed KMeansBSP DistanceMeasurer class instantiation

Modified:
    hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java

Modified: hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java
URL: http://svn.apache.org/viewvc/hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java?rev=1392772&r1=1392771&r2=1392772&view=diff
==============================================================================
--- hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java (original)
+++ hama/trunk/ml/src/main/java/org/apache/hama/ml/KMeansBSP.java Tue Oct  2 07:38:14 2012
@@ -106,15 +106,19 @@ public final class KMeansBSP
         "Centers file must contain at least a single center!");
     this.centers = centers.toArray(new DoubleVector[centers.size()]);
 
-    distanceMeasurer = new EuclidianDistance();
+
     String distanceClass = peer.getConfiguration().get(DISTANCE_MEASURE_CLASS);
     if (distanceClass != null) {
       try {
         distanceMeasurer = ReflectionUtils.newInstance(distanceClass);
       } catch (ClassNotFoundException e) {
-        e.printStackTrace();
+        throw new RuntimeException(new StringBuilder("Wrong DistanceMeasurer implementation
").
+            append(distanceClass).append(" provided").toString());
       }
     }
+    else {
+      distanceMeasurer = new EuclidianDistance();
+    }
 
     maxIterations = peer.getConfiguration().getInt(MAX_ITERATIONS_KEY, -1);
     // normally we want to rely on OS caching, but if not, we can cache in heap
@@ -386,7 +390,7 @@ public final class KMeansBSP
   public static Path prepareInputText(int k, Configuration conf, Path txtIn,
       Path center, Path out, FileSystem fs) throws IOException {
 
-    Path in = null;
+    Path in;
     if (fs.isFile(txtIn)) {
       in = new Path(txtIn.getParent(), "textinput/in.seq");
     } else {
@@ -424,7 +428,8 @@ public final class KMeansBSP
       VectorWritable vector = new VectorWritable(vec);
       dataWriter.append(vector, value);
       if (k > i) {
-        centerWriter.append(vector, value);
+          assert centerWriter != null;
+          centerWriter.append(vector, value);
       } else {
         if (centerWriter != null) {
           centerWriter.close();



Mime
View raw message