saving

comsdk/graph.py

@@ -37,10 +37,10 @@ class Selector(Func):
 
 
 class Transfer:
-    def __init__(self, edge, output_state, index=None):
+    def __init__(self, edge, output_state, order=0):
         self.edge = edge
         self.output_state = output_state
-        self.index = index
+        self.order = order
 
     def transfer(self, data, dynamic_keys_mapping={}):
         #print(dynamic_keys_mapping)
@@ -149,7 +149,7 @@ class State:
         self.transfers.sort(key = __sort_by_order)
         print(self.name)
         for t in self.transfers:
-            print("\t", t.edge.morph_name)
+            print("\t", t.edge.pred_name, t.edge.morph_name)
         if self._proxy_state is not None:
             return self._proxy_state.idle_run(idle_run_type, branching_states_history)
         if idle_run_type == IdleRunType.INIT:
@@ -180,7 +180,7 @@ class State:
                 next_state = transfer.output_state
                 next_state.idle_run(idle_run_type, branching_states_history + [next_state.name])
 
-    def connect_to(self, term_state, edge):
+    def connect_to(self, term_state, edge=None):
         self.transfers.append(Transfer(edge, term_state))
 #        edge.set_output_state(term_state)
 #        self.output_edges.append(edge)

comsdk/parser.py

@@ -209,7 +209,7 @@ class Parser():
             self.fact.add_state(right[0])
             if len(spl)==4:
                 pr =self._param_from_props(spl[3])
-                self.fact.add_connection(left[0], right[0], pr.morphism)
+                self.fact.add_connection(left[0], right[0], pr.morphism, ordr=pr.order if pr.order is not None else 0)
             elif len(spl)==3:
                 self.fact.add_connection(left[0], right[0], None)
 

test.adot

@@ -37,6 +37,6 @@ digraph CODEOBJECT_GENERATOR
 	CONTENT_SUBSTITUTED -> RESULT_SAVED [morphism=EDGE_5,comment="test comment to cpp"]
 // В зависимости от результата вычисления функции-SELECTOR осуществляется переход по
 //первому или второму ребру
-	RESULT_SAVED, DUMP_CREATED -> __END__ [morphism=(EDGE_8, EDGE_9)]
+	RESULT_SAVED -> __END__ [morphism=EDGE_8, order=(40)]
 	RESULT_SAVED -> INPUT_READY,FAKE,__END__ [selector=SELECTOR, morphism=(EDGE_6,EDGE_1,EDGE_7), order=(30,20,10)]
 }