Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
DistanceMetric is now interface
Renamed method for squaredDistance
  • Loading branch information
oschrenk committed Jun 10, 2010
1 parent ab17686 commit eee5b80
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 17 deletions.
6 changes: 2 additions & 4 deletions src/edu/wlu/cs/levy/cg/DistanceMetric.java
@@ -1,8 +1,6 @@
// Abstract distance metric class

package edu.wlu.cs.levy.cg;

abstract class DistanceMetric {
interface DistanceMetric {

protected abstract double distance(double[] a, double[] b);
double distance(double[] a, double[] b);
}
13 changes: 4 additions & 9 deletions src/edu/wlu/cs/levy/cg/EuclideanDistance.java
Expand Up @@ -2,23 +2,18 @@

package edu.wlu.cs.levy.cg;

class EuclideanDistance extends DistanceMetric {

protected double distance(double[] a, double[] b) {

return Math.sqrt(sqrdist(a, b));
public class EuclideanDistance implements DistanceMetric {

public double distance(double[] a, double[] b) {
return Math.sqrt(squaredDistance(a, b));
}

protected static double sqrdist(double[] a, double[] b) {

protected static double squaredDistance(double[] a, double[] b) {
double dist = 0;

for (int i = 0; i < a.length; ++i) {
double diff = (a[i] - b[i]);
dist += diff * diff;
}

return dist;
}
}
3 changes: 1 addition & 2 deletions src/edu/wlu/cs/levy/cg/HPoint.java
Expand Up @@ -34,8 +34,7 @@ protected boolean equals(HPoint p) {
}

protected static double sqrdist(HPoint x, HPoint y) {

return EuclideanDistance.sqrdist(x.coord, y.coord);
return EuclideanDistance.squaredDistance(x.coord, y.coord);
}

public String toString() {
Expand Down
4 changes: 2 additions & 2 deletions src/edu/wlu/cs/levy/cg/HammingDistance.java
Expand Up @@ -2,9 +2,9 @@

package edu.wlu.cs.levy.cg;

class HammingDistance extends DistanceMetric {
public class HammingDistance implements DistanceMetric {

protected double distance(double[] a, double[] b) {
public double distance(double[] a, double[] b) {

double dist = 0;

Expand Down

0 comments on commit eee5b80

Please sign in to comment.