Merge branch 'initial-state-projection' into core

process_bigraph/tests.py

@@ -27,6 +27,12 @@ def schema(self):
                 'level': 'float'}}
 
 
+    def initial_state(self):
+        return {
+            'inputs': {
+                'level': 11.0}}
+
+
     def update(self, state, interval):
         return {
             'level': state['level'] * self.config['rate']}

process_bigraph/type_system.py

@@ -4,7 +4,7 @@
 =============
 """
 
-from bigraph_schema import Edge, TypeSystem, get_path, establish_path, set_path
+from bigraph_schema import Edge, TypeSystem, get_path, establish_path, set_path, deep_merge
 from process_bigraph.registry import protocol_registry
 
 
@@ -286,13 +286,28 @@ def infer_edge(self, schema, wires):
 
     def initialize_edge_state(self, schema, path, edge):
         initial_state = edge['instance'].initial_state()
-        ports = get_path(schema, path + ('_ports',))
+        input_ports = get_path(schema, path + ('_inputs',))
+        output_ports = get_path(schema, path + ('_outputs',))
+        ports = {'inputs': input_ports, 'outputs': output_ports}
 
-        return self.project_edge(
+        input_state = self.project_edge(
             ports,
             edge,
             path[:-1],
-            initial_state)
+            initial_state,
+            ports_key='input')
+
+        output_state = self.project_edge(
+            ports,
+            edge,
+            path[:-1],
+            initial_state,
+            ports_key='output')
+
+        state = deep_merge(input_state, output_state)
+
+        return state
+
 
     def dehydrate(self, schema):
         return {}