From 7d63ffcafce5d67d9b8a30256819bb1dd844d215 Mon Sep 17 00:00:00 2001
From: Malte Schokolowski <baw8441@uni-hamburg.de>
Date: Tue, 21 Dec 2021 16:54:38 +0100
Subject: [PATCH] bigfixes 2
---
verarbeitung/test/update_graph_unittest.py | 9 ---------
verarbeitung/update_graph/delete_nodes_edges.py | 7 -------
2 files changed, 16 deletions(-)
diff --git a/verarbeitung/test/update_graph_unittest.py b/verarbeitung/test/update_graph_unittest.py
index 72c234f..e7d4533 100644
--- a/verarbeitung/test/update_graph_unittest.py
+++ b/verarbeitung/test/update_graph_unittest.py
@@ -13,21 +13,12 @@ from verarbeitung.update_graph.update_graph import update_graph
class UpdatingTest(unittest.TestCase):
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):
# 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)
->>>>>>> 12394774f5f71d40e023e38322e78524055d4878
def test_deleted_input_dois(self):
nodes_old_single, edges_old_single = init_graph_construction(['doi_lg_1_i'],2,2,True)
diff --git a/verarbeitung/update_graph/delete_nodes_edges.py b/verarbeitung/update_graph/delete_nodes_edges.py
index 63d5180..53e826e 100644
--- a/verarbeitung/update_graph/delete_nodes_edges.py
+++ b/verarbeitung/update_graph/delete_nodes_edges.py
@@ -90,14 +90,7 @@ def delete_nodes_and_edges(input_list, common_nodes, old_edges_list):
search_ref_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)
input_list = usable_nodes.copy()
print(input_list)
#return(usable_nodes, valid_edges)
->>>>>>> 12394774f5f71d40e023e38322e78524055d4878
--
GitLab