resolve conflicts

.gitignore

@@ -8,3 +8,4 @@ dist/
 build/
 
 process_bigraph.egg-info/
+out/

process_bigraph/composite.py

@@ -3,8 +3,9 @@
 Composite, Process, and Step classes
 ====================================
 """
-
+import os
 import copy
+import json
 import math
 import collections
 from typing import Dict
@@ -710,6 +711,24 @@ def __init__(self, config=None, core=None):
 
         # self.run_steps(self.to_run)
 
+    def save(self,
+             filename='one_cell_two_directions.json',
+             outdir='out',
+             ):
+        serialized_doc = self.core.serialize(
+            schema=self.composition,
+            state=self.state,
+        )
+
+        # save the dictionary to a JSON file
+        if not os.path.exists(outdir):
+            os.makedirs(outdir)
+        filename = os.path.join(outdir, filename)
+
+        # write the new data to the file
+        with open(filename, 'w') as json_file:
+            json.dump(serialized_doc, json_file, indent=4)
+            print(f"Created new file: {filename}")
 
     def reset_step_state(self, step_paths):
         self.trigger_state = build_trigger_state(

process_bigraph/experiments/comets.py

@@ -465,34 +465,17 @@ def run_comets():
                 'fields': ['fields']
             }
         },
-        # 'emitter': {
-        #     '_type': 'step',
-        #     'address': 'local:ram-emitter',
-        #     'config': {
-        #         'emit': {
-        #             'fields': 'map',
-        #             'time': 'float',
-        #         }
-        #     },
-        #     'inputs': {
-        #         'fields': ['fields'],
-        #         'time': ['global_time']
-        #     }
-        # }
     }
 
     sim = Composite({
         'state': composite_state,
         'emitter': {
             'mode': 'all'}}, core=core)
 
-    # TODO: this should fail validation
-    # sim = Composite({
-    #     'state': composite_state,
-    #     'emitter': {
-    #         'mode': 'pluto'}}, core=core)
+    # save the document
+    sim.save(filename='comets.json', outdir='out')
 
-    sim.update({}, 10.0)
+    sim.update({}, 100.0)
 
     results = sim.gather_results()
 

process_bigraph/process_types.py

@@ -75,6 +75,9 @@ def serialize_process(schema, value, core):
     """Serialize a process to a JSON-safe representation."""
     # TODO -- need to get back the protocol: address and the config
     process = value.copy()
+    process['config'] = core.serialize(
+        process['instance'].config_schema,
+        process['config'])
     del process['instance']
     return process
 
@@ -169,7 +172,7 @@ def deserialize_step(schema, encoded, core):
         '_inherit': 'string'},
 
     # TODO: have the default enum be the first option
-    'emitter_mode': 'enum[none,all,paths,bridge,port]',
+    'emitter_mode': 'enum[none,all,stores,bridge,paths,ports]',
 
     'interval': {
         '_type': 'interval',