From 70f0e5acbde218df0e361b439aee46254be6d241 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Mon, 29 Jul 2024 12:59:27 -0700 Subject: [PATCH] Script optimization to mark dataframe row that it has been visited already, which is needed in the case of multiple parents - otherwise we traverse the tree a stupid number of times for all possible parents. --- src/scripts/apex-treesummary.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scripts/apex-treesummary.py b/src/scripts/apex-treesummary.py index d9468b57..5f5b4244 100755 --- a/src/scripts/apex-treesummary.py +++ b/src/scripts/apex-treesummary.py @@ -336,6 +336,10 @@ def graphRank2(index, df, parentNode, droplist, args): #name = df.loc[df['node index'] == index, 'name'].iloc[0] childNode = parentNode.addChild(name, childDF) + # If we have visited this tree before, we are done. + if childDF['visited'].item(): + return + # slice out the children from the dataframe children = df[df['parent index'] == index] # Iterate over the children indexes and add to our node @@ -343,7 +347,7 @@ def graphRank2(index, df, parentNode, droplist, args): if child == index: continue graphRank2(child, df, childNode, droplist, args) - + df.loc[df['node index'] == index,'visited'] = True import ast def main(): @@ -416,6 +420,7 @@ def main(): root = TreeNode('apex tree base', pd.DataFrame()) root.index = -1 #unique = df.drop_duplicates(subset=["node index", "parent index", "name"], keep='first') + df['visited'] = False graphRank2(0, df, root, droplist, args) roots = [root]