diff --git a/Overlap/Analysis/report_graph_int.py b/Overlap/Analysis/report_graph_int.py index 1b394d2bba926699abf1d31501068698de453bd5..b6921270bd58b9056aca9fc7f094d6fa9a5cc771 100755 --- a/Overlap/Analysis/report_graph_int.py +++ b/Overlap/Analysis/report_graph_int.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -"""edgelist_anti.csv or edgelist_cyclo.csv must be in the current -directory.""" +"""edgelist.csv must be in the current directory. + +""" import networkx as nx import csv @@ -138,12 +139,9 @@ if __name__ == "__main__": action = "store_true") parser.add_argument("--interp", help = "Read interpolated eddies", action = "store_true") - parser.add_argument("orientation", help ="Choose a graph", - choices = ["anti", "cyclo"]) args = parser.parse_args() - G = read_eddy_graph(f"edgelist_{args.orientation}.csv", - read_interp = args.interp) + G = read_eddy_graph("edgelist.csv", read_interp = args.interp) if args.node is None: H = G @@ -188,5 +186,5 @@ if __name__ == "__main__": if args.gv: A = to_eddy_agraph(H) - A.write(f"eddy_graph_{args.orientation}.gv") - print(f'Created file "eddy_graph_{args.orientation}.gv".') + A.write("eddy_graph.gv") + print('Created file "eddy_graph.gv".') diff --git a/Overlap/Analysis/tests.json b/Overlap/Analysis/tests.json index 3773fc1dc725b0b1db26a76f09391d2d710a392d..4be184e47d3922b0c915c2b730827c6ee0ae55b7 100644 --- a/Overlap/Analysis/tests.json +++ b/Overlap/Analysis/tests.json @@ -44,11 +44,14 @@ "command": [ "$src_dir/Overlap/Analysis/report_graph_int.py", "--gv", - "--merging", "anti" + "--merging" ], "required": [ - "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist_anti.csv", + [ + "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist_anti.csv", + "edgelist.csv" + ], "$tests_old_dir/Graph_from_Matlab_v6_anti/node_id_param.json" ] }