tricc-oo 1.4.28__tar.gz → 1.5.1__tar.gz

{tricc_oo-1.4.28/tricc_oo.egg-info → tricc_oo-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: tricc-oo
-Version: 1.4.28
+Version: 1.5.1
 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.4.28 → tricc_oo-1.5.1}/pyproject.toml

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

{tricc_oo-1.4.28 → tricc_oo-1.5.1}/tricc_oo/converters/xml_to_tricc.py

@@ -518,7 +518,7 @@ def inject_bridge_path(node, nodes):
             )
         )
     ]
-    if (
+    if ( len(prev_nodes)>1 and 
         sum(
             [
                 (

{tricc_oo-1.4.28 → tricc_oo-1.5.1}/tricc_oo/visitors/tricc.py

@@ -67,7 +67,7 @@ def get_last_version(name, processed_nodes,  _list=None):
 # node is the node to calculate
 # processed_nodes are the list of processed nodes
 def get_node_expressions(node, processed_nodes, process=None):
-    is_calculate = issubclass(node.__class__, TriccNodeCalculateBase)
+    is_calculate = issubclass(node.__class__, TriccNodeCalculateBase) and not issubclass(node.__class__, (TriccNodeDisplayBridge,TriccNodeBridge))
     expression = None
     # in case of recursive call processed_nodes will be None
     if processed_nodes is None or is_ready_to_process(node, processed_nodes=processed_nodes):
@@ -369,7 +369,7 @@ def get_bridge_path(prev_nodes, node=None,edge_only=False):
         'path_len': node.path_len + 1 * (node == p_p_node)
     }
     
-    if sum([0 if issubclass(n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)) else 1 for n in prev_nodes])>0 : #and len(node.prev_nodes)>1:
+    if len(prev_nodes)>1 and sum([0 if issubclass(n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)) else 1 for n in prev_nodes])>0 :
         calc= TriccNodeDisplayBridge( **data)
     else:
         calc =  TriccNodeBridge( **data)
@@ -1530,7 +1530,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
         prev_exp = get_node_expression(
             node.path,
             processed_nodes=processed_nodes,
-            is_calculate=is_calculate,
+            is_calculate=False,
             is_prev=True,
             process=process)
         if prev_exp and expression:
@@ -2068,7 +2068,7 @@ def get_rhombus_terms( node, processed_nodes, is_calculate=False, negate=False,
         exit(1)
 
     if expression is not None:
-        if isinstance(expression, TriccOperation):
+        if isinstance(expression, (TriccOperation, TriccStatic)):
             return expression
         elif issubclass(expression.__class__ , TriccNodeCalculateBase):
             return TriccOperation(

{tricc_oo-1.4.28 → tricc_oo-1.5.1}/tricc_oo/visitors/xform_pd.py

@@ -43,7 +43,7 @@ def make_breakpoints(df, pausepoint, calculate_name=None, replace_dots=False):
     next_begin_group_loc = min([i for i in df.index[df['type'] == 'begin group'] if i > end_inputs_loc])
     next_pause_point_begin_group_loc = min([i for i in df.index[df['type'] == 'begin group'] if i > pausepoint])
     
-    df_input = df.loc[next_begin_group_loc:pausepoint]
+    df_input = df.loc[next_begin_group_loc:next_pause_point_begin_group_loc]
     
     # Define field types to handle
     typesconvert = ['integer', 'decimal', 'select_', 'text']

{tricc_oo-1.4.28 → tricc_oo-1.5.1/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.28
+Version: 1.5.1
 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