X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FTopologicalBag.java;h=eb71cdc6641ffd00520cacd38197fd2d09f9c957;hb=16460a4ebf976fddbcb4dd79f1fa0b010d61602b;hp=6e73681567344c0ed1ed51dfa1b66e5f1353401f;hpb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;p=sbp.git

diff --git a/src/edu/berkeley/sbp/util/TopologicalBag.java b/src/edu/berkeley/sbp/util/TopologicalBag.java
index 6e73681..eb71cdc 100644
--- a/src/edu/berkeley/sbp/util/TopologicalBag.java
+++ b/src/edu/berkeley/sbp/util/TopologicalBag.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.util;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
@@ -101,11 +103,11 @@ public class TopologicalBag<K,V> implements MapBag<Topology<K>,V>, VisitableMap<
     private HashMap<K,Iterable<V>> cache = new HashMap<K,Iterable<V>>();
     public Iterable<V> getAll(Topology<K> k) { return h.get(k); }
 
-    public <B,C> void invoke(K k, Invokable<V,B,C> ivbc, B b, C c) {
+    public <B> void invoke(K k, Invokable<V,B> ivbc, B b) {
         for(Topology<K> t : h.keySet())
             if (t.contains(k))
                 for(V v : h.get(t))
-                    ivbc.invoke(v, b, c);
+                    ivbc.invoke(v, b);
     }
 
     public Iterable<V> get(K k) {
@@ -144,8 +146,6 @@ public class TopologicalBag<K,V> implements MapBag<Topology<K>,V>, VisitableMap<
             for(V vv : h.get(t)) al.add(vv);
             Object[] vs = new Object[al.size()];
             al.toArray(vs);
-            // XXX hack
-            if (t instanceof Atom) t = ((Atom)t).underlying();
             IntegerTopology it = (IntegerTopology)t;
             for(Range r : it.getRanges()) {
                 min_.add(r.isMinNegInf() ? Long.MIN_VALUE : r.getMin());
@@ -165,13 +165,13 @@ public class TopologicalBag<K,V> implements MapBag<Topology<K>,V>, VisitableMap<
                         return true;
                 return false;
             }
-            public <B,C> void invoke(K k, Invokable<V,B,C> ivbc, B b, C c) {
+            public <B> void invoke(K k, Invokable<V,B> ivbc, B b) {
                 int asint = f.invoke(k);
                 for(int i=0; i<size; i++) {
                     if (min[i] <= asint && max[i] >= asint) {
                         Object[] arr = v[i];
                         for(int j=0; j<arr.length; j++)
-                            ivbc.invoke((V)arr[j], b, c);
+                            ivbc.invoke((V)arr[j], b);
                     }
                 }
             }