checkpoint

[sbp.git] / src / edu / berkeley / sbp / Input.java

diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index be41cbe..407d843 100644 (file)
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -18,30 +18,12 @@ public interface Input<Token> {
     /** a location <i>between tokens<i> in the input stream */
     public static interface Location<Tok> extends Comparable<Location> {
         public String toString();
-
-        /** an implementation of Location for a cartesian grid (row, col) */
-        public static class Cartesian<Tok> implements Location<Tok>, Comparable<Location> {
-            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<Tok> c = (Cartesian<Tok>)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<Loc extends Location> /* implements Topology<Location<Tok>> */ {
         public final Loc start;
         public final Loc end;
+        public String toString() { return start+"-"+end; }
         public Region(Loc a, Loc b) {
             switch(a.compareTo(b)) {
                 case -1: