tricc-oo 1.5.2__tar.gz → 1.5.3__tar.gz

{tricc_oo-1.5.2/tricc_oo.egg-info → tricc_oo-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.2
+Version: 1.5.3
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.5.2 → tricc_oo-1.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.5.2"
+version = "1.5.3"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.5.2 → tricc_oo-1.5.3}/tricc_oo/visitors/tricc.py

@@ -1818,17 +1818,42 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
         expression_inputs = node.expression_inputs
         expression_inputs = clean_or_list(expression_inputs)
     else:
-        expression_inputs = []        
+        expression_inputs = []  
+    prev_activities = {}
     for prev_node in node.prev_nodes:
-        if excluded_name is None or prev_node != excluded_name or (
-                isinstance(excluded_name, str) and hasattr(prev_node, 'name') and prev_node.name != excluded_name): # or isinstance(prev_node, TriccNodeActivityEnd):
-            # the rhombus should calculate only reference
-            add_sub_expression(expression_inputs, get_node_expression(
-                prev_node,
-                processed_nodes=processed_nodes,
-                is_calculate=is_calculate,
-                is_prev=True,
-                process=process))
+        if prev_node.activity.id not in prev_activities:
+            prev_activities[prev_node.activity.id]=[]
+        prev_activities[prev_node.activity.id].append(prev_node)
+    
+    for act_id in prev_activities:
+        for prev_node in prev_activities[act_id]:
+            act_expression_inputs = [] 
+            if excluded_name is None or prev_node != excluded_name or (
+                    isinstance(excluded_name, str) and hasattr(prev_node, 'name') and prev_node.name != excluded_name): # or isinstance(prev_node, TriccNodeActivityEnd):
+                # the rhombus should calculate only reference
+                sub = get_node_expression(
+                    prev_node,
+                    processed_nodes=processed_nodes,
+                    is_calculate=is_calculate,
+                    is_prev=True,
+                    process=process)
+                if not isinstance(node, TriccNodeActivity):
+                    add_sub_expression(expression_inputs, sub )
+                else:
+                    add_sub_expression(act_expression_inputs, sub )
+                
+        if act_expression_inputs:
+            act_sub = or_join(act_expression_inputs)
+            if act_sub == TriccStatic(True): 
+                        act_sub = get_node_expression(
+                        prev_node.activity,
+                        processed_nodes=processed_nodes,
+                        is_calculate=True,
+                        is_prev=True,
+                        negate=False,
+                        process=process
+                    )
+            add_sub_expression(expression_inputs, act_sub )
             # avoid void is there is not conditions to avoid looping too much itme
     # expression_inputs = clean_or_list(
     #     [
@@ -1837,12 +1862,8 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
     #         else e 
     #         for e in expression_inputs])
     
-    expression = None
-    if len(expression_inputs) == 1:
-        expression = expression_inputs[0]
-    
-    elif expression_inputs:
-        expression = or_join(
+    if expression_inputs:
+        expression =  or_join(
             expression_inputs
         )
         # if isinstance(node,  TriccNodeExclusive):

{tricc_oo-1.5.2 → tricc_oo-1.5.3/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.2
+Version: 1.5.3
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues