Changeset 194

Timestamp:

05/23/08 15:04:33 (7 months ago)

Author:

edsuom

Message:

PMC now running with more efficient proposal code and sequencing of said code in chunks

Files:

• projects/AsynCluster/trunk/svpmc/params.py (modified) (1 diff)
• projects/AsynCluster/trunk/svpmc/pmc.py (modified) (1 diff)
• projects/AsynCluster/trunk/svpmc/test/test_params.py (modified) (1 diff)

projects/AsynCluster/trunk/svpmc/params.py

@@ -63 +63 @@
-    corresponding element of the original instance.
-    """
+    @classmethod
+    def concatenate(cls, FA_list):
+        """
+        Returns an instance of me that is a concatentation of the instances in
+        the supplied list I{FA_list}. Analogous to SciPy's C{concatenate}
+        function.
+        """
+        length = 0
+        shape = None
+        for FA in FA_list:
+            length += len(FA)
+            if shape is None:
+                shape = FA.shape
+            elif FA.shape != shape:
+                raise ValueError(
+                    "FlexArray dimensions must agree except for d_0")
+        shape = list(shape)
+        shape[0] = length
+        newVersion = cls(*shape)
+        k = 0
+        for FA in FA_list:
+            for FA_sub in FA:
+                newVersion[k] = FA_sub
+                k += 1
+        return newVersion
+
-    def __init__(self, *shape):
-        self._shape = tuple([int(x) for x in shape])

projects/AsynCluster/trunk/svpmc/pmc.py

@@ -208 +208 @@
-            print "%6.4f\t%+12.2f\t%s" % (self.pm.V[vIndex], L, info)
-            return L
+
+        def evaluateChunk(XP):
+            XP_list.append(XP)
+            # Here's where the vast majority of the CPU time is expended!
+            dList = [
+                self.mm.likelihood(XPk).addCallback(weight) for XPk in XP]
+            return defer.gatherResults(dList)
-        
-        j = 0
-        N = len(X)
+        XP_list = []
-        W = s.empty(len(X))
-        wfd = defer.waitForDeferred(self.queue.call(self.proposals, X, vIndex))
-        yield wfd
-        XP = wfd.getResult()
-        while j < N:
-            N_this = min([self.chunkSize, N-j])
-
-
-
-
-
+
+
+
+
+
+
+
+
-            yield wfd
-            W[j:j+N_this] = wfd.getResult()
-            j += N_this
-XP
+params.FlexArray.concatenate(XP_list)
-
-    @defer.deferredGenerator

projects/AsynCluster/trunk/svpmc/test/test_params.py

@@ -108 +108 @@
-                self.failUnlessEqual(xj[k], "%d:%d" % (j, k))
-        self.failUnlessEqual(j, 2)
+
+    def test_concatenate_1d(self):
+        x = self._make_stringArray(3, 1)
+        y = params.FlexArray.concatenate([x, x])
+        self.failUnlessEqual(len(y), 6)
+        self.failUnlessEqual(y[0,0], '0:0')
+        self.failUnlessEqual(y[3,0], '0:0')
-
-