Changeset 88

Timestamp:

03/18/08 23:56:20 (10 months ago)

Author:

jkyllo

Message:

Did some conversion from Input/Output to Sink/Source terminology.
Converted many tabs to spaces. Hopefully all.
Added TimedSource? and beginnings of ConsoleInputSource?.
Added Graph class.
Added use of locks in NotificationCenter?.

Files:

• branches/spike-20070613 tubes/tubes.py (modified) (5 diffs)

branches/spike-20070613 tubes/tubes.py

@@ +1 @@
+# vim:ts=4:sw=4:expandtab:smarttab
+
+
-"""Tubes is a library for moving data between nodes where each node can process
-those data before passing them onto other nodes.  Conceptually a graph is
@@ -12 +15 @@
-for specifying constants.
-"""
+
+
+import threading
+import time
+import sys
+
+
+# An output posts a notification when it has data ready.  The "read" method on
+# the output can be called to retrieve the data.  At that point the data is no
+# longer available on the output.  This is a one-time deal.  The way this works
+# in the system is that the Graph object itself (or perhaps an Edge object...)
+# listens for the notification.  When it is received, it keeps a copy for each
+# Edge/Sink that is associated with the Source.  Then, each Sink receives a
+# notification that there is input data ready.  The Sink may then call a
+# function on the edge that reads the data.  In some ways the edges are simply
+# acting as buffer proxies for the Sources.
+
+
+def curry(_curried_func, *args, **kwargs):
+    def _curried(*moreargs, **morekwargs):
+        return _curried_func(*(args+moreargs), **dict(kwargs, **morekwargs))
+    return _curried
+
+
+
+
+class Graph(object):
+    """A directed, non-cyclical graph """
+    def __init__(self):
+        self.nodes = []
+        self.edges = {}
+        self.nc = NotificationCenter()
+
+    def load(self, filename):
+        pass
+
+    def save(self, filename):
+        pass
+
+    def addNode(self, node):
+        self.nodes.append(node)
+
+    def removeNode(self, node):
+        self.nodes.remove(node)
+
+    def connect(self, source, sink):
+        self.nc.addListener(source, 'DATA_READY', curry(self.sourceDataReady, sink=sink))
+        self.nc.addListener(sink, 'DATA_REQUEST', curry(self.sinkDataRequest, source=source))
+        if source not in self.edges:
+            self.edges[source] = []
+        self.edges[source].append(sink)
+
+        self.nc.post(source, 'CONNECT')
+        self.nc.post(sink, 'CONNECT')
+
+    def disconnect(self, source, sink):
+        self.nc.removeListener(source, 'DATA_READY', self.sourceDataReady)
+        self.nc.removeListener(sink, 'DATA_REQUEST', self.sinkDataRequest)
+        if source in self.edges:
+            self.edges[source].remove(sink)
+
+        self.nc.post(source, 'DISCONNECT')
+        self.nc.post(sink, 'DISCONNECT')
+
+    def sourceDataReady(self, source, signal, sink):
+        sink.write(source.read())
+
+    def sinkDataRequest(self, sink, signal, source):
+        sink.write(source.read())
-
-class Node(object):
@@ -24 +96 @@
-    they can be tied to the outputs of other Nodes.
-    """
-input
-output
-
-
-       
-       self.input
-       self.output
-
-Input
-       
-       return self.input
-
-Output
-       
-       return self.output
+sink
+source
+
+
+        
+        self.sink
+        self.source
+
+Sink
+        
+        return self.sink
+
+Source
+        
+        return self.source
-
-class NodeInputOutput(object):
-Input or an Output
+Sink or an Source
-    is written to it so that it may later be read (in order).  It doesn't care
-Input or as an Output
+Sink or as an Source
-    either."""
-
-
-
-
+
+
+
+
+
-
-    def connect(self, output):
-       
-       
+        
+        
-
-    def disconnect(self):
-       
-       
+        
+        
-
-    def processInput(self, node_output, signal):
-       
-       
+        
+        
-
-
@@ -67 +140 @@
-    ####  Node Output
-    def readyData(self):
-       
+        
-
-    def read(self, count=1):
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-
+        
+
+        
+        
+
+        
+        
+        
+        
+        
+
-    def readSample(self):
-       
+        
-
-
-    ####  Node Input
-    def write(self, data):
-       
-       
-       
+        
+        
+        
-
-    def writeSample(self, data):
-       
-
-Input
-Input
+        
+
+Sink
+Sink
-    
-    Signals:
-       DataRequest
+    DATA_REQUEST
-    """
-    def __init__(self):
-
-
-
-
-
-
-
-
-
-
-
+
-
-    def write(self, data):
-       
-
-Output
-Output on a Node that sends data to Input
-
+        
+
+Source
+Source on a Node that sends data to Sink
+less you call and do an e-check kinda thing
-    Signals:
-       DataRead
+    DATA_READY
-    """
-
-
-
-
-
+
+
+
+
-
-    def read(self):
-
-
+
+
+
+
+
-
-#    def addListener(self, listener, signal):
-      
+   
-#
-#    def tripSignal(self, signal):
-      
-      
-      
-              
+   
+   
+   
+       
-
-
@@ -168 +233 @@
-
-    def __new__(cls, *args, **kwargs):
-       
-       
-       
-       
-       
-       
-
-       
-       
-
-       
+        
+        
+        
+        
+        
+        
+
+        
+        
+
+        
-
-
-class NotificationCenter(Singleton):
-    def __init__(self):
-
+
+
-
-    def _ensureListenerList(self, source, signal):
-
-
+
+
+
-
-    def addListener(self, source, signal, callable):
-
-
-
+
+
+
+
+
+
+
+
-
-    def removeListener(self, source, signal, func):
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def post(self, source, signal):
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class PassthroughNode(Node):
-    def __init__(self):
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class ConsolePrintNode(Node):
-    def __init__(self):
-       
-       
-       i = Input
-       
-       
-       self.input
+        
+        
+        i = Sink
+        
+        
+        self.sink
-
-    def handleConnections(self, node_input, signal):
-       
-
-       
-       
-       
-       
+        
+
+        
+        
+        
+        
-
-    def handleInput(self, node_output, signal):
-       
-       
-       
-       
-       
-               
-
-Output
+        
+        
+        
+        
+        
+                
+
+Source
-    def getFunc(self):
-       
-       
-
-       
+        
+        
+
+