diff --git a/verarbeitung/test/construct_graph_unittest.py b/verarbeitung/test/construct_graph_unittest.py
index 8af37fa13cc31e10a9f2be6fd0b138d9d88d7eb6..b73dc4cabf196068ed2f35a69ecb437512e97da7 100644
--- a/verarbeitung/test/construct_graph_unittest.py
+++ b/verarbeitung/test/construct_graph_unittest.py
@@ -14,12 +14,12 @@ class ConstructionTest(unittest.TestCase):
def testCycle(self):
- nodes, edges = init_graph_construction(['doiz1'],1,1,True,False)
+ nodes, edges, err_list = init_graph_construction(['doiz1'],1,1,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes, ['doiz1', 'doiz2'])
self.assertCountEqual(edges, [['doiz1', 'doiz2'], ['doiz2', 'doiz1']])
- nodes, edges = init_graph_construction(['doiz1'],2,2,True,False)
+ nodes, edges, err_list = init_graph_construction(['doiz1'],2,2,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes, ['doiz1', 'doiz2'])
self.assertCountEqual(edges, [['doiz2', 'doiz1'], ['doiz1', 'doiz2']])
@@ -31,56 +31,56 @@ class ConstructionTest(unittest.TestCase):
#def testEmptyDepth(self):
def testEmptyDepthHeight(self):
- nodes, edges = init_graph_construction(['doi1'],0,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi1'],0,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi1'])
self.assertCountEqual(edges, [])
- nodes, edges = init_graph_construction(['doi1', 'doi2'],0,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi1', 'doi2'],0,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes, ['doi1','doi2'])
self.assertCountEqual(edges, [['doi1', 'doi2']])
- nodes, edges = init_graph_construction(['doi1', 'doi2', 'doi3'],0,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi1', 'doi2', 'doi3'],0,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes, ['doi1','doi2', 'doi3'])
self.assertCountEqual(edges, [['doi3', 'doi1'], ['doi1', 'doi2']])
def testInnerEdges(self):
- nodes, edges = init_graph_construction(['doi_ie1'],1,1,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_ie1'],1,1,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_ie1','doi_ie2','doi_ie3'])
self.assertCountEqual(edges,[['doi_ie1','doi_ie2'],['doi_ie3','doi_ie1'],['doi_ie3','doi_ie2']])
def testRightHeight(self):
- nodes, edges = init_graph_construction(['doi_h01'],0,1,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_h01'],0,1,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_h01'])
self.assertCountEqual(edges, [])
- nodes, edges = init_graph_construction(['doi_h02'],0,1,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_h02'],0,1,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_h02','doi_h1'])
self.assertCountEqual(edges, [['doi_h1','doi_h02']])
- nodes, edges = init_graph_construction(['doi_h02'],0,2,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_h02'],0,2,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_h02','doi_h1','doi_h2'])
self.assertCountEqual(edges, [['doi_h1','doi_h02'], ['doi_h2','doi_h1']])
def testRightDepth(self):
- nodes, edges = init_graph_construction(['doi_d01'],1,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_d01'],1,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_d01'])
self.assertCountEqual(edges, [])
- nodes, edges = init_graph_construction(['doi_d02'],1,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_d02'],1,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_d02','doi_d1'])
self.assertCountEqual(edges, [['doi_d02','doi_d1']])
- nodes, edges = init_graph_construction(['doi_d02'],2,0,True,False)
+ nodes, edges, err_list = init_graph_construction(['doi_d02'],2,0,True,False)
doi_nodes = keep_only_dois(nodes)
self.assertCountEqual(doi_nodes,['doi_d02','doi_d1','doi_d2'])
self.assertCountEqual(edges, [['doi_d02','doi_d1'], ['doi_d1','doi_d2']])
diff --git a/verarbeitung/update_graph/connect_new_input.py b/verarbeitung/update_graph/connect_new_input.py
index df28ee6baef07825753459d69aa6b57f9c25c68d..af7363a29fa1bac6bf2fba3dbf3de0d50e64196d 100644
--- a/verarbeitung/update_graph/connect_new_input.py
+++ b/verarbeitung/update_graph/connect_new_input.py
@@ -42,6 +42,12 @@ def complete_changed_group_nodes_test(test_nodes, test_edges, inserted_test_node
def find_furthermost_citations(new_nodes, new_edges, node, old_search_depth, cit_type):
'''
+ :param new_nodes: list of nodes which are generated seperately from main node list to avoid recursive problems
+ :type new_nodes List[Publication]
+
+ :param new_edges: list of edges which are generated seperately from main edge list to avoid recursive problems
+ :type new_edges: List[List[String,String]]
+
:param node: node which is known but not from input group
:type node: Publication
@@ -51,7 +57,9 @@ def find_furthermost_citations(new_nodes, new_edges, node, old_search_depth, cit
:param cit_type: determines whether the function call is for a reference or citation
:type cit_type: String
- function to find the furthermost citation/reference for given node which is from the same group
+ function to find the furthermost citation/reference for given node which is from the same group and
+ adds all found nodes between input node and furthermost citations.
+ It return a list of furthermost citations.
'''
citations_saved = [node]