Skip to content
Snippets Groups Projects
Commit 6f5bb0c1 authored by Lionel GUEZ's avatar Lionel GUEZ
Browse files

Add arguments `(in|out)put_segments`

Add arguments `input_segments` and `output_segments`. Because on
one occasion I wanted to use and keep two versions of input and output
graphs in the same directory
parent a7c54832
No related branches found
No related tags found
No related merge requests found
...@@ -15,14 +15,12 @@ ...@@ -15,14 +15,12 @@
"command": "command":
[ [
"$src_dir/Trajectories/cost_function.py", "$src_dir/Trajectories/cost_function.py",
"$PWD/Global_1993_2020_SHPC", "Anticyclones" "$PWD/Global_1993_2020_SHPC", "Anticyclones",
"$tests_old_dir/Perf_segments/segments.gt",
"segments_cost_functions.gt"
], ],
"env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"}, "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
"symlink": "symlink": ["$PWD/Global_1993_2020_graph_anti/e_overestim.txt"]
[
"$PWD/Global_1993_2020_graph_anti/e_overestim.txt",
"$tests_old_dir/Perf_segments/segments.gt"
]
}, },
{ {
"title": "Perf_trajectories", "title": "Perf_trajectories",
......
...@@ -48,16 +48,13 @@ ...@@ -48,16 +48,13 @@
"title": "Cost_functions", "title": "Cost_functions",
"command": "command":
[ [
"$src_dir/Trajectories/cost_function.py", "--graphml", "$src_dir/Trajectories/cost_function.py",
"$tests_old_dir/Extraction_eddies_region_2_noise/SHPC", "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
"Anticyclones" "Anticyclones", "$tests_old_dir/Segments/segments.graphml",
"segments_cost_functions.graphml"
], ],
"env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"}, "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
"symlink": "symlink": ["$tests_old_dir/EGr2nd15md4/e_overestim.txt"],
[
"$tests_old_dir/EGr2nd15md4/e_overestim.txt",
"$tests_old_dir/Segments/segments.graphml"
],
"exclude_cmp": ["timings.txt"] "exclude_cmp": ["timings.txt"]
}, },
{ {
...@@ -76,15 +73,13 @@ ...@@ -76,15 +73,13 @@
"This is a case where the speed is not defined on a whole segment.", "This is a case where the speed is not defined on a whole segment.",
"command": "command":
[ [
"$src_dir/Trajectories/cost_function.py", "--graphml", "$src_dir/Trajectories/cost_function.py",
"$tests_old_dir/Greece/SHPC", "Anticyclones" "$tests_old_dir/Greece/SHPC", "Anticyclones",
"$tests_old_dir/Greece_segments/segments.graphml",
"segments_cost_functions.graphml"
], ],
"env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"}, "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
"symlink": "symlink": ["$tests_old_dir/Greece_graph/e_overestim.txt"]
[
"$tests_old_dir/Greece_graph/e_overestim.txt",
"$tests_old_dir/Greece_segments/segments.graphml"
]
}, },
{ {
"title": "Trajectories", "title": "Trajectories",
......
...@@ -86,8 +86,10 @@ timings = open("timings.txt", "w") ...@@ -86,8 +86,10 @@ timings = open("timings.txt", "w")
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("SHPC_dir") parser.add_argument("SHPC_dir")
parser.add_argument("orientation", choices = ["Anticyclones", "Cyclones"]) parser.add_argument("orientation", choices = ["Anticyclones", "Cyclones"])
parser.add_argument("--graphml", action = "store_true", parser.add_argument("input_segments", help = "input graph of segments without "
help = "save to graphml format") "cost functions, suffix .gt (graph-tool) or .graphml")
parser.add_argument("output_segments", help = "output graph of segments with "
"cost functions, suffix .gt (graph-tool) or .graphml")
args = parser.parse_args() args = parser.parse_args()
with open("e_overestim.txt") as f: e_overestim = int(f.read()) with open("e_overestim.txt") as f: e_overestim = int(f.read())
...@@ -102,12 +104,7 @@ delta_r_std = 8.6953e3 ...@@ -102,12 +104,7 @@ delta_r_std = 8.6953e3
# Load the graph_tool file: # Load the graph_tool file:
print('Loading graph...') print('Loading graph...')
g = graph_tool.load_graph(args.input_segments)
try:
g = graph_tool.load_graph('segments.gt')
except FileNotFoundError:
g = graph_tool.load_graph('segments.graphml')
print('Loading done...') print('Loading done...')
print("Input graph:") print("Input graph:")
print("Number of vertices:", g.num_vertices()) print("Number of vertices:", g.num_vertices())
...@@ -223,12 +220,7 @@ t1 = time.perf_counter() ...@@ -223,12 +220,7 @@ t1 = time.perf_counter()
timings.write(f"iterating on edges: {t1 - t0:.0f} s\n") timings.write(f"iterating on edges: {t1 - t0:.0f} s\n")
t0 = t1 t0 = t1
print("Saving...") print("Saving...")
g.save(args.output_segments)
if args.graphml:
g.save('segments_cost_functions.graphml')
else:
g.save('segments_cost_functions.gt')
print('All done') print('All done')
t1 = time.perf_counter() t1 = time.perf_counter()
timings.write(f"saving: {t1 - t0:.0f} s\n") timings.write(f"saving: {t1 - t0:.0f} s\n")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment