Added SplitBehavior and RunFinite behaviors

3 files changed, 93 insertions, 5 deletions

diff --git a/behaviors/RunFinite.py b/behaviors/RunFinite.py
new file mode 100644
index 0000000..de2ce27
--- /dev/null
+++ b/behaviors/RunFinite.py
@@ -0,0 +1,25 @@
+from operationscore.Behavior import *
+import util.ComponentRegistry as compReg
+
+class RunFinite(Behavior):
+    """RunFinite will just wire input to output, but only a finite number of
+    times as specified by the Iterations argument tag"""
+
+    def behaviorInit(self):
+        pass
+
+    def processResponse(self, inp, state):
+
+        if state:
+            iterations = state
+        else:
+            iterations = self['Iterations']
+
+        if iterations > 0:
+            out = inp
+        else:
+            out = []
+
+        iterations -= 1
+        
+        return (out, iterations)
diff --git a/behaviors/SplitBehavior.py b/behaviors/SplitBehavior.py
new file mode 100644
index 0000000..1892ad3
--- /dev/null
+++ b/behaviors/SplitBehavior.py
@@ -0,0 +1,45 @@
+from operationscore.Behavior import *
+import util.ComponentRegistry as compReg
+
+class SplitBehavior(Behavior):
+    """SplitBehavior takes a list of behaviors, runs the input on all behaviors
+    listed, and then returns the concantenation of all the behavior outputs.
+    Behavior list is given under tag <BehaviorList> as a list of Id's
+    
+    Example:
+    <Behavior>
+        <Class>behaviors.SplitBehavior</Class>
+        <Args>
+            <Id>splitbehavior</Id>
+            <BehaviorList>
+                <Id>behavior1Id</Id>
+                <Id>behavior2Id</Id>
+            </BehaviorList>
+        </Args>
+    </Behavior>
+    """
+
+    def behaviorInit(self):
+        pass
+        
+    def processResponse(self, inp, state):
+
+        out = []
+        newstate = {}
+        for behaviorId in self['BehaviorList']:
+
+            behavior = compReg.getComponent(behaviorId)
+            if behaviorId in state:
+                behaviorState = state[behaviorId]
+            else:
+                behaviorState = []
+
+            #print behaviorId, " ", str(inp), ",", str(behaviorState)
+            output = behavior.immediateProcessInput(inp, behaviorState)
+            (behaviorOutput, behaviorState) = output
+            #print "  -->", str(behaviorState), ",", str(behaviorOutput)
+            
+            newstate[behaviorId] = behaviorState
+            out.extend(behaviorOutput)
+
+        return (out, newstate)
diff --git a/config/C5Sign.xml b/config/C5Sign.xml
index f99ef2b..93b3028 100644
--- a/config/C5Sign.xml
+++ b/config/C5Sign.xml
@@ -230,8 +230,8 @@
                     <Id>centerleft</Id>
                     <Id>center</Id>
                 </Inputs>
-                <TimeMap>{'scanningbars':10,'runcolordecay':10,'expandingcircles':10}</TimeMap>
-                <InputMap>{'scanningbars':'centerleft', 'runcolordecay':'center',\
+                <TimeMap>{'framedbars':10,'runcolordecay':10,'expandingcircles':10}</TimeMap>
+                <InputMap>{'framedbars':'centerleft', 'runcolordecay':'center',\
                     'expandingcircles':'center'}</InputMap>
                 <RenderToScreen>True</RenderToScreen>
             </Args>
@@ -333,13 +333,21 @@
             </Args>
         </Behavior>
         <Behavior>
+            <Class>behaviors.RunFinite</Class>
+            <Args>
+                <Id>runonce</Id>
+                <Iterations>1</Iterations>
+            </Args>
+        </Behavior>
+        <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
                 <Id>coloredframe</Id>
-                <Inputs>
+                <!--Inputs>
                     <Id>centeronce</Id>
-                </Inputs>
+                </Inputs-->
                 <ChainedBehaviors>
+                    <Id>runonce</Id>
                     <Id>redcolor</Id>
                     <Id>square</Id>
                     <Id>mover</Id>
@@ -347,7 +355,17 @@
                     <Id>stripsonly</Id>
                 </ChainedBehaviors>
                 <RecursiveHooks>{'mover':'colorshift'}</RecursiveHooks>
-                <RenderToScreen>True</RenderToScreen>
+                <RenderToScreen>False</RenderToScreen>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.SplitBehavior</Class>
+            <Args>
+                <Id>framedbars</Id>
+                <BehaviorList>
+                    <Id>coloredframe</Id>
+                    <Id>scanningbars</Id>
+                </BehaviorList>
             </Args>
         </Behavior>
         <Behavior>