checkpoint

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

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 70c2904..98726c1 100644 (file)
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -11,7 +11,7 @@ import edu.berkeley.sbp.*;
 public abstract class Atom<T> extends Element implements Topology<T> {
 
     protected abstract Topology<T> top();
-    public    abstract String toString();
+    public    abstract String       toString();
     public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
@@ -28,29 +28,5 @@ public abstract class Atom<T> extends Element implements Topology<T> {
     public int               hashCode()                 { return top().hashCode(); }
     public boolean           equals(Object o)           { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
 
-    // Subclasses //////////////////////////////////////////////////////////////////////////////
-
-    public static class Infer<T extends Input> extends Atom<T> {
-        private final Element e;
-        public Infer(Element e) { this.e = e; }
-        public Topology<T> top() { return (Topology<T>)toAtom(e); }
-        public String toString() { return e.toString(); /* FIXME should be toAtom() */ }
-    }
-    
-    public static class Invert<T extends Input> extends Atom<T> {
-        private final Atom<T> a;
-        public Invert(Atom<T> a) { this.a = a; }
-        public Topology<T> top() { return ((Topology<T>)a.top()).complement(); }
-        public String toString() { return "~"+a; }
-    }
-
-    static Topology toAtom(Element e) {
-        if (e instanceof Atom) return (Atom)e;
-        if (e instanceof Sequence) return ((Sequence)e).toAtom();
-        Topology ret = null;
-        for(Sequence s : (Union)e)
-            ret = ret==null ? toAtom(s) : ret.union(s.toAtom());
-        return ret;
-    }
 }