X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=0989bc0d717b39da90bc390d1bd7ebc4c1e169d7;hp=b9832b2d313c20a3ea314359a3d746ab91b83bbe;hb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;hpb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index b9832b2..0989bc0 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -8,25 +8,11 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.*;
 
 /** <font color=green>an element which matches exactly one input token</font> */
-public abstract class Atom<T> extends Element implements Topology<T> {
+public abstract class Atom<T> extends Element implements Topology<Atom<T>> {
 
-    protected abstract Topology<T> top();
+    public  abstract Topology<T>  underlying();
     public    abstract String       toString();
     public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
-    // Topology Thunks //////////////////////////////////////////////////////////////////////////////
-
-    public Topology<T>       unwrap()                   { return top().unwrap(); }
-    public Topology<T>       empty()                    { return top().empty(); }
-    public boolean           contains(T v)              { return top().contains(v); }
-    public Topology<T>       intersect(Topology<T> t)   { return top().intersect(t); }
-    public Topology<T>       minus(Topology<T> t)       { return top().minus(t); }
-    public Topology<T>       union(Topology<T> t)       { return top().union(t); }
-    public Topology<T>       complement()               { return top().complement(); }
-    public boolean           disjoint(Topology<T> t)    { return top().disjoint(t); }
-    public boolean           containsAll(Topology<T> t) { return top().containsAll(t); }
-    public int               hashCode()                 { return top().hashCode(); }
-    public boolean           equals(Object o)           { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
-
 }