Get `e_overestim` from graph property

Instead of reading it from a separate file.

Trajectories/Tests/perf_tests.json

@@ -16,9 +16,6 @@
             "Anticyclones",
             "$tests_old_dir/Perf_segments/segments.gt",
             "segments_cost_functions.gt"
-	],
-	"symlink": [
-            "$my_data_dir/Global_1993_2021/Graph_anti/e_overestim.txt"
 	]
     },
     "Perf_trajectories": {

Trajectories/Tests/tests.json

@@ -45,9 +45,6 @@
             "$tests_old_dir/Segments/segments.graphml",
             "segments_cost_functions.graphml"
 	],
-	"symlink": [
-            "$tests_old_dir/EGr2nd15md4/e_overestim.txt"
-	],
 	"exclude_cmp": [
             "timings.txt"
 	]
@@ -69,9 +66,6 @@
             "$tests_old_dir/Greece_segments/segments.graphml",
             "segments_cost_functions.graphml"
 	],
-	"symlink": [
-            "$tests_old_dir/Greece_graph/e_overestim.txt"
-	],
 	"exclude_cmp": [
             "timings.txt"
 	]
@@ -106,7 +100,7 @@
 	"command": [
             "$src_dir/Trajectories/plot_traj.py",
             "$tests_old_dir/Trajectories/expanded_traj.json",
-            "$tests_old_dir/Cost_functions/e_overestim.txt",
+            "$tests_old_dir/EGr2nd15md4/e_overestim.txt",
             "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
             "Anticyclones",
             "--save=png",
@@ -117,7 +111,7 @@
 	"command": [
             "$src_dir/Trajectories/plot_traj.py",
             "$tests_old_dir/Greece_trajectories/expanded_traj.json",
-            "$tests_old_dir/Greece_cost_function/e_overestim.txt",
+            "$tests_old_dir/Greece_graph/e_overestim.txt",
             "$tests_old_dir/Greece/SHPC",
             "Anticyclones",
             "--save=png",

Trajectories/cost_function.py

@@ -5,8 +5,6 @@ the non-local cost applied to edges.
 
 Input:
 
--- "e_overestim.txt", expected to be in the current directory;
-
 -- the graph of segments without cost;
 
 -- the SHPC.
@@ -95,7 +93,6 @@ parser.add_argument("input_segments", help = "input graph of segments without "
 parser.add_argument("output_segments", help = "output graph of segments with "
                     "cost, suffix .gt (graph-tool) or .graphml")
 args = parser.parse_args()
-with open("e_overestim.txt") as f: e_overestim = int(f.read())
 
 # Set some values needed for the cost function:
 delta_cent_mean = 3.8481 # in km
@@ -133,8 +130,8 @@ print("Iterating on vertices...")
 for n in g.vertices():
     if n.in_degree() != 0:
         # Define properties for beginning of the segment:
-        properties = node_to_prop(g.vp.inst_eddies[n][:n_days_avg], e_overestim,
-                                  SHPC, args.orientation)
+        properties = node_to_prop(g.vp.inst_eddies[n][:n_days_avg],
+                                  g.gp.e_overestim, SHPC, args.orientation)
         g.vp.first_av_rad[n], g.vp.first_av_ros[n] \
             = calculate_radii_rossby(properties)
         g.vp.pos_first[n] = properties[0]["pos"] # in degrees
@@ -152,7 +149,8 @@ for n in g.vertices():
                 # We cannot use part of properties from the beginning
                 # of the segment.
                 properties = node_to_prop(g.vp.inst_eddies[n][- n_days_avg:],
-                                          e_overestim, SHPC, args.orientation)
+                                          g.gp.e_overestim, SHPC,
+                                          args.orientation)
             else:
                 # assertion: n.in_degree() != 0 and n_days_avg <
                 # len_seg < 2 * n_days_avg
@@ -161,7 +159,7 @@ for n in g.vertices():
                 # of the segment.
                 properties = properties[len_seg - n_days_avg:] \
                     + node_to_prop(g.vp.inst_eddies[n][n_days_avg:],
-                                   e_overestim, SHPC, args.orientation)
+                                   g.gp.e_overestim, SHPC, args.orientation)
 
             g.vp.last_av_rad[n], g.vp.last_av_ros[n] \
                 = calculate_radii_rossby(properties)