Changeset 70bb1cc8f9a8886fea37e017478f3a85c0b6e233 for pyflu/pyflu/fifo.py

Timestamp:

04/30/10 02:53:15 (2 years ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

acf43d008d077e46c8915fc1a184b56ffea0dac1

Parents:

8d7196fb48bcec3bf822911c6aaff79b2b90cda4

git-committer:

Luper Rouch <luper.rouch@…> (04/30/10 02:53:15)

Message:

pyflu:

• refactored fifo.FifoBuffer?, now working more like numpy arrays
• jsonalize:
  • added load() and save() methods to JSONAlizable
  • alternate constructor can be specified in register()
• qt:
  • TreeModel? now uses JSON to serialize python objects in drag and drop operations

File:

• pyflu/pyflu/fifo.py (modified) (2 diffs)

pyflu/pyflu/fifo.py

@@ -7 +7 @@
     """
 
-    def __init__(self, size, dimensions=1, dtype=np.float32, filled=False):
-        self._cache = np.zeros(size * dimensions, dtype)
-        self._values = np.zeros(size * dimensions, dtype)
-        self._size = size
-        self._dimensions = dimensions
-        self._array_size = size * dimensions
+    def __init__(self, shape, dtype=np.float32, filled=False):
+        self._cache = np.zeros(shape, dtype)
+        self._values = np.zeros(shape, dtype)
+        self.shape = shape
         if filled:
-            self._ind = self._array_size
+            self._ind = self.shape[0]
         else:
             self._ind = 0
         self._cached = False
 
-    def add(self, *args):
+    def add(self, value):
         """
-        Add a vector to the queue.
+        Add a value to the buffer.
         """
-        ind = self._ind % self._array_size
-        self._values[ind:ind + self._dimensions] = args
-        self._ind += self._dimensions
+        ind = self._ind % self.shape[0]
+        self._values[ind] = value
+        self._ind += 1
         self._cached = False
 
@@ -32 +30 @@
         Returns a numpy array containing the last stored values.
         """
-        if self._ind < self._array_size:
+        if self._ind < self.shape[0]:
             return self._values[:self._ind]
         if not self._cached:
-            ind = self._ind % self._array_size
-            self._cache[:self._array_size - ind] = self._values[ind:]
-            self._cache[self._array_size - ind:] = self._values[:ind]
+            ind = self._ind % self.shape[0]
+            self._cache[:self.shape[0] - ind] = self._values[ind:]
+            self._cache[self.shape[0] - ind:] = self._values[:ind]
             self._cached = True
         return self._cache
 
     def __len__(self):
-        if self._ind < self._array_size:
-            return self._ind / self._dimensions
-        return self._size
+        return min(self._ind, self.shape[0])