X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FIntegerTopology.java;h=e82ce736dbf8e3528feddc1e5a1bf795e12652c2;hb=3473141880127c6aa52d094d51739e5eb67f1703;hp=cac19e9b19676da56eb8ec7fde15d15c2be445b5;hpb=c61dfbe5593a9257d39e84261d48472a74975afa;p=sbp.git

diff --git a/src/edu/berkeley/sbp/util/IntegerTopology.java b/src/edu/berkeley/sbp/util/IntegerTopology.java
index cac19e9..e82ce73 100644
--- a/src/edu/berkeley/sbp/util/IntegerTopology.java
+++ b/src/edu/berkeley/sbp/util/IntegerTopology.java
@@ -7,9 +7,11 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
 
 /** implementation of <tt>Topology</tt> for any class for which there is a mapping to the <tt>int</tt>s */
-public class IntegerTopology<V extends IntegerTopology.IntegerMappable> implements Topology<V> {
+public class IntegerTopology<V extends IntegerMappable> implements Topology<V> {
     private final Range.Set rs;
-    
+
+    private static final IntegerTopology empty = new IntegerTopology();
+
     public Range.Set getRanges()         { return new Range.Set(rs); }
 
     public IntegerTopology()             { this(new Range.Set()); }
@@ -20,23 +22,18 @@ public class IntegerTopology<V extends IntegerTopology.IntegerMappable> implemen
     public IntegerTopology(Range r)      { this(new Range.Set(r)); }
     public IntegerTopology(Range.Set rs) { this.rs = rs; }
 
-    public Topology<V> fresh()             { return new IntegerTopology<V>();   }
-    public Topology<V> dup()               { return new IntegerTopology<V>(this.rs); }
-    public Topology<V> dup(Range.Set rs)   { return new IntegerTopology<V>(rs); }
+    public Topology<V> empty()             { return (Topology<V>)empty;   }
         
-    public void             add(Topology<V> t)         { rs.add(((IntegerTopology<V>)t).rs); }
-    public void             remove(Topology<V> t)      { rs.remove(((IntegerTopology<V>)t).rs); }
-    public void             add(V v)                   { rs.add(v.toInt()); }
-    public void             remove(V v)                { rs.remove(v.toInt()); }
     public boolean          contains(V v)              { return rs.contains(v.toInt()); }
         
-    public Topology<V> complement()                    { return dup(rs.complement()); }
-    public Topology<V> intersect(Topology<V> t)        { return dup(rs.intersect(((IntegerTopology<V>)t).rs)); }
-    public Topology<V> minus(Topology<V> t)            { return dup(rs.intersect(((IntegerTopology<V>)t).rs.complement())); }
-    public Topology<V> union(Topology<V> t)            { return dup(rs.union(((IntegerTopology<V>)t).rs)); }
-    public boolean          disjoint(Topology<V> t)    { return rs.intersect(((IntegerTopology<V>)t).rs).size()==0; }
-    public boolean          containsAll(Topology<V> t) { return rs.intersect(((IntegerTopology<V>)t).rs).equals(((IntegerTopology<V>)t).rs); }
+    public Topology<V>      complement()               { return new IntegerTopology<V>(rs.complement()); }
+    public Topology<V>      intersect(Topology<V> t)   { return new IntegerTopology<V>(rs.intersect(((IntegerTopology<V>)t.unwrap()).rs)); }
+    public Topology<V>      minus(Topology<V> t)       { return new IntegerTopology<V>(rs.intersect(((IntegerTopology<V>)t.unwrap()).rs.complement())); }
+    public Topology<V>      union(Topology<V> t)       { return new IntegerTopology<V>(rs.union(((IntegerTopology<V>)t.unwrap()).rs)); }
+    public boolean          disjoint(Topology<V> t)    { return rs.intersect(((IntegerTopology<V>)t.unwrap()).rs).size()==0; }
+    public boolean          containsAll(Topology<V> t) { return rs.containsAll(((IntegerTopology<V>)t.unwrap()).rs); }
 
+    public Topology<V> unwrap() { return this; }
     public int     hashCode()                          { return rs.hashCode(); }
     public boolean equals(Object o)                    { return o!=null && o instanceof IntegerTopology && ((IntegerTopology<V>)o).rs.equals(rs); }
 
@@ -70,7 +67,4 @@ public class IntegerTopology<V extends IntegerTopology.IntegerMappable> implemen
         return sb.toString();
     }
     */
-    public static interface IntegerMappable {
-        public int toInt();
-    }
 }