X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FTopologicalBag.java;h=f7ce6e75858ea08dae148463c061240f8daced71;hb=0f9676168fa7384f8cf66ed02c1c8caa22381206;hp=6c538e6b2957d40879df12e149aa8800cafec9b6;hpb=f33c05adc5aa3dd324c5352cdbd6f4b55359acad;p=sbp.git

diff --git a/src/edu/berkeley/sbp/util/TopologicalBag.java b/src/edu/berkeley/sbp/util/TopologicalBag.java
index 6c538e6..f7ce6e7 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.*;
@@ -135,7 +137,7 @@ public class TopologicalBag<K,V> implements MapBag<Topology<K>,V>, VisitableMap<
         }
     }
 
-    public VisitableMap<K,V> optimize() {
+    public VisitableMap<K,V> optimize(final Functor<K,Integer> f) {
         ArrayList<Long> min_ = new ArrayList<Long>();
         ArrayList<Long> max_ = new ArrayList<Long>();
         ArrayList<Object[]> v_ = new ArrayList<Object[]>();
@@ -157,16 +159,14 @@ public class TopologicalBag<K,V> implements MapBag<Topology<K>,V>, VisitableMap<
         final Object[][]   v = new Object[size][]; v_.toArray(v);
         return new VisitableMap<K,V>() {
             public boolean contains(K k) {
-                IntegerTopology.IntegerMappable im = (IntegerTopology.IntegerMappable)k;
-                int asint = im.toInt();
+                int asint = f.invoke(k);
                 for(int i=0; i<size; i++)
                     if (min[i] <= asint && max[i] >= asint && v[i].length > 0)
                         return true;
                 return false;
             }
             public <B,C> void invoke(K k, Invokable<V,B,C> ivbc, B b, C c) {
-                IntegerTopology.IntegerMappable im = (IntegerTopology.IntegerMappable)k;
-                int asint = im.toInt();
+                int asint = f.invoke(k);
                 for(int i=0; i<size; i++) {
                     if (min[i] <= asint && max[i] >= asint) {
                         Object[] arr = v[i];