diff --git a/cost_function.py b/cost_function.py index db65ef44dcc50738945250703b82240571e061ce..663aee5028fdd0aed7f748bf25279024bad868ff 100755 --- a/cost_function.py +++ b/cost_function.py @@ -134,7 +134,7 @@ num_of_days_to_avg = 7 # number of days to average print("Iterating on vertices...") for n in g.vertices(): - segment = g.vp.segment[n] + segment = g.vp.inst_eddies[n] num_of_days = len(segment) # Calculate the date index, the eddy index and the SHPC index of diff --git a/segments.py b/segments.py index 78d2981b95c745acdff92ffe08ce239130eee95e..e25e4b93e2bdb0de3f3773ab682a43e771d451a1 100755 --- a/segments.py +++ b/segments.py @@ -35,25 +35,25 @@ t0 = t1 # Processing: -g.vp['segment'] = g.new_vp('object') # this object will be a list +g.vp['inst_eddies'] = g.new_vp('object') # this object will be a list print('Collapsing into segments...') g.set_fast_edge_removal() verts_to_del = [] for v in g.vertices(): - if not g.vp.segment[v]: - g.vp.segment[v] = [int(g.vp.name[v])] + if not g.vp.inst_eddies[v]: + g.vp.inst_eddies[v] = [int(g.vp.name[v])] if v.in_degree() == 1: v2 = next(v.in_edges()).source() if v2.out_degree() == 1: g.remove_edge(g.edge(v2, v)) - g.vp.segment[v2].append(int(g.vp.name[v])) + g.vp.inst_eddies[v2].append(int(g.vp.name[v])) for v3 in v.out_neighbors(): g.remove_edge(g.edge(v, v3)) - g.vp.segment[v].append(int(g.vp.name[v3])) + g.vp.inst_eddies[v].append(int(g.vp.name[v3])) new_edge = g.add_edge(v2, v3) if(v.in_degree() == 0 and v.out_degree() == 0):