X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=846fd9a7b60de45439cc7650913e8121e6f1c75a;hb=e64e99e8fd3b7a291639ee28a4a5ef3e75d6de4a;hp=be41cbebeff1af501c5a65d25c5318a14f1210e9;hpb=ac3843911c47a601ffd679d2e075b519d3a18d6a;p=sbp.git diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java index be41cbe..846fd9a 100644 --- a/src/edu/berkeley/sbp/Input.java +++ b/src/edu/berkeley/sbp/Input.java @@ -18,25 +18,6 @@ public interface Input { /** a location between tokens in the input stream */ public static interface Location extends Comparable { public String toString(); - - /** an implementation of Location for a cartesian grid (row, col) */ - public static class Cartesian implements Location, Comparable { - protected final int row; - protected final int col; - public String toString() { return row+":"+col; } - public int getCol() { return col; } - public int getRow() { return row; } - public Cartesian(int col, int row) { this.row = row; this.col = col; } - public int compareTo(Location loc) throws ClassCastException { - if (!(loc instanceof Cartesian)) throw new ClassCastException(); - Cartesian c = (Cartesian)loc; - if (row < c.row) return -1; - if (row > c.row) return 1; - if (col < c.col) return -1; - if (col > c.col) return 1; - return 0; - } - } } public static class Region /* implements Topology> */ {