Skip to content
Snippets Groups Projects
Commit 7d63ffca authored by Malte Schokolowski's avatar Malte Schokolowski
Browse files

bigfixes 2

parent 76b4aebc
No related branches found
No related tags found
No related merge requests found
...@@ -13,21 +13,12 @@ from verarbeitung.update_graph.update_graph import update_graph ...@@ -13,21 +13,12 @@ from verarbeitung.update_graph.update_graph import update_graph
class UpdatingTest(unittest.TestCase): class UpdatingTest(unittest.TestCase):
maxDiff = None maxDiff = None
<<<<<<< HEAD
def test_import_from_json(self):
nodes_old, edges_old = init_graph_construction(['doi_lg_1_i'],2,2,True)
output_to_json(nodes_old, edges_old, test_var = True)
nodes_new, edges_new = input_from_json('test_output.json')
self.assertCountEqual(nodes_old,nodes_new)
self.assertCountEqual(edges_old, edges_new)
=======
# def test_import_from_json(self): # def test_import_from_json(self):
# nodes_old, edges_old = init_graph_construction(['doi_lg_1_i'],2,2,True) # nodes_old, edges_old = init_graph_construction(['doi_lg_1_i'],2,2,True)
# output_to_json(nodes_old, edges_old, test_var = True) # output_to_json(nodes_old, edges_old, test_var = True)
# nodes_new, edges_new = input_from_json('test_output.json') # nodes_new, edges_new = input_from_json('test_output.json')
# self.assertCountEqual(nodes_old,nodes_new) # self.assertCountEqual(nodes_old,nodes_new)
# self.assertCountEqual(edges_old, edges_new) # self.assertCountEqual(edges_old, edges_new)
>>>>>>> 12394774f5f71d40e023e38322e78524055d4878
def test_deleted_input_dois(self): def test_deleted_input_dois(self):
nodes_old_single, edges_old_single = init_graph_construction(['doi_lg_1_i'],2,2,True) nodes_old_single, edges_old_single = init_graph_construction(['doi_lg_1_i'],2,2,True)
......
...@@ -90,14 +90,7 @@ def delete_nodes_and_edges(input_list, common_nodes, old_edges_list): ...@@ -90,14 +90,7 @@ def delete_nodes_and_edges(input_list, common_nodes, old_edges_list):
search_ref_graph_rec(pub) search_ref_graph_rec(pub)
search_cit_graph_rec(pub) search_cit_graph_rec(pub)
<<<<<<< HEAD
valid_edges = back_to_valid_edges(old_edges_list, usable_nodes)
return(usable_nodes, valid_edges)
=======
back_to_valid_edges(old_edges_list, usable_nodes) back_to_valid_edges(old_edges_list, usable_nodes)
input_list = usable_nodes.copy() input_list = usable_nodes.copy()
print(input_list) print(input_list)
#return(usable_nodes, valid_edges) #return(usable_nodes, valid_edges)
>>>>>>> 12394774f5f71d40e023e38322e78524055d4878
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment