Fixed tests

k-means/src/main/java/it/unipi/hadoop/model/Point.java

@@ -88,7 +88,7 @@ public float distance(Point p, int h){
         if (h == 0)
             return -1;
 
-        if (h == Float.POSITIVE_INFINITY) {
+        if (h == Integer.MAX_VALUE) {
             // Chebyshev distance
             float max = -1f;
             float diff = 0.0f;
@@ -104,7 +104,7 @@ public float distance(Point p, int h){
             for (int i = 0; i < dim; i++) {
                 dist += Math.pow(Math.abs(this.components.getValue(i) - p.components.getValue(i)), h);
             }
-            dist = (float)Math.pow(dist, 1/h);
+            dist = (float) Math.pow(dist, 1f/h);
             return dist;
         }
     }

k-means/src/test/java/it/unipi/hadoop/PointTest.java

@@ -37,48 +37,74 @@ protected void tearDown() throws Exception {
 
     public void testManhattan1() {
         float distance = p1.distance(p2, 1);
-        System.out.println("Mario Distance: " + distance);
-        assertTrue(true);       
+        System.out.println("Manhattan Test 1 Distance: " + distance);
+        assertTrue(Math.abs(distance - 2.0) < 0.0001f);       
     }
 
     public void testManhattan2() {
         float distance = t1.distance(t2, 1);
-        System.out.println("Distance: " + distance);
-        assertTrue(distance - 0 < 0.0001f );
+        System.out.println("Manhattan Test 2 Distance: " + distance);
+        assertTrue(Math.abs(distance - 5.0) < 0.0001f);
     }
 
     public void testManhattan3() {
         float distance = z1.distance(z2, 1);
-        System.out.println("Distance: " + distance);
-        assertTrue(distance - 0  < 0.0001f );
+        System.out.println("Manhattan Test 3 Distance: " + distance);
+        assertTrue(Math.abs(distance - 19.0) < 0.0001f );
     }
 
     public void testEuclidean1() {
-
+        float distance = p1.distance(p2, 2);
+        System.out.println("Euclidean Test 1 Distance: " + distance);
+        assertTrue(Math.abs(distance - 1.4142) < 0.0001f );
     }
 
     public void testEuclidean2() {
-
+        float distance = t1.distance(t2, 2);
+        System.out.println("Euclidean Test 2 Distance: " + distance);
+        assertTrue(Math.abs(distance - 3.3166) < 0.0001f );
     }
 
-    public void testMinkowsky1() {
+    public void testEuclidean3() {
+        float distance = z1.distance(z2, 2);
+        System.out.println("Euclidean Test 3 Distance: " + distance);
+        assertTrue(Math.abs(distance - 7.9372) < 0.0001f);
+    }
 
+    public void testMinkowsky1() {
+        float distance = p1.distance(p2, 5);
+        System.out.println("Minkowsky Test 1 Distance: " + distance);
+        assertTrue(Math.abs(distance - 1.1486) < 0.0001f );
     }
 
     public void testMinkowsky2() {
-
+        float distance = t1.distance(t2, 5);
+        System.out.println("Minkowsky Test 2 Distance: " + distance);
+        assertTrue(Math.abs(distance - 3.0049) < 0.0001f );
     }
 
     public void testMinkowsky3() {
-
+        float distance = z1.distance(z2, 5);
+        System.out.println("Minkowsky Test 3 Distance: " + distance);
+        assertTrue(Math.abs(distance - 5.2788) < 0.0001f);
     }
 
     public void testInfinity1() {
-
+        float distance = p1.distance(p2, Integer.MAX_VALUE);
+        System.out.println("Infinity Test 1 Distance: " + distance);
+        assertTrue(Math.abs(distance - 1.0) < 0.0001f);
     }
 
-    public void testInfinity() {
+    public void testInfinity2() {
+        float distance = t1.distance(t2, Integer.MAX_VALUE);
+        System.out.println("Infinity Test 2 Distance: " + distance);
+        assertTrue(Math.abs(distance - 3.0) < 0.0001f);   
+    }
 
+    public void testInfinity3() {
+        float distance = z1.distance(z2, Integer.MAX_VALUE);
+        System.out.println("Infinity Test 3 Distance: " + distance);
+        assertTrue(Math.abs(distance - 5.0) < 0.0001f);
     }
 
  }

scripts/distancecalculator.py

@@ -2,8 +2,11 @@
 
 #[(1, 2, 3.3, -4, 5.6, 6.88, 7)]
 
-XA = [(1, 2, 3, -4, 5, 6, 7)]
-XB = [(2, 1, 0, 1, 2, 3, 4)]
+# XA = [(1, 2, 3, -4, 5, 6, 7)]
+# XB = [(2, 1, 0, 1, 2, 3, 4)]
+
+XA = [(1, 2)]
+XB = [(2, 1)]
 
 
 eu = distance.cdist(XA, XB, 'euclidean')