From 560638f877c531691b36b7e06aece3b98db08a51 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Wed, 21 Feb 2024 18:51:27 +0100
Subject: [PATCH] Move function `partition_graph_date`
Move function `partition_graph_date` from script `report_graph.py` to
script `edgelist_to_Graphviz.py`. `partition_graph_date` is no longer
used in `report_graph.py`.
---
Overlap/Analysis/edgelist_to_Graphviz.py | 28 +++++++++++++++++++++---
Overlap/Analysis/report_graph.py | 22 -------------------
Trajectories/draw_segments.py | 4 ++--
Trajectories/edgelist_to_Graphviz.py | 1 +
Trajectories/report_graph.py | 1 -
5 files changed, 28 insertions(+), 28 deletions(-)
create mode 120000 Trajectories/edgelist_to_Graphviz.py
delete mode 120000 Trajectories/report_graph.py
diff --git a/Overlap/Analysis/edgelist_to_Graphviz.py b/Overlap/Analysis/edgelist_to_Graphviz.py
index a7f2991b..40d1d1f6 100755
--- a/Overlap/Analysis/edgelist_to_Graphviz.py
+++ b/Overlap/Analysis/edgelist_to_Graphviz.py
@@ -1,5 +1,29 @@
#!/usr/bin/env python3
+import util_eddies
+
+def partition_graph_date(A, e_overestim):
+ """Add subgraphs in pygraphviz graph, one subgraph for each date. We
+ use the fact that the date can be deduced from the node
+ identification number.
+
+ """
+
+ my_subgraphs = {}
+
+ for n in A.iternodes():
+ date_index = util_eddies.node_to_date_eddy(
+ int(n), e_overestim, only_date=True
+ )
+
+ if date_index in my_subgraphs:
+ my_subgraphs[date_index].append(n)
+ else:
+ my_subgraphs[date_index] = [n]
+
+ for date, s in my_subgraphs.items():
+ A.add_subgraph(s, rank="same")
+
if __name__ == "__main__":
import csv
import sys
@@ -7,8 +31,6 @@ if __name__ == "__main__":
import pygraphviz as pgv
- import report_graph
-
if len(sys.argv) != 3:
sys.exit("Required arguments: input-edgelist output-Graphviz")
@@ -21,5 +43,5 @@ if __name__ == "__main__":
reader = csv.reader(f, delimiter = " ", skipinitialspace = True)
for row in reader: G.add_edge(*row)
- report_graph.partition_graph_date(G, e_overestim)
+ partition_graph_date(G, e_overestim)
G.write(sys.argv[2])
diff --git a/Overlap/Analysis/report_graph.py b/Overlap/Analysis/report_graph.py
index b4a48c95..129ae950 100755
--- a/Overlap/Analysis/report_graph.py
+++ b/Overlap/Analysis/report_graph.py
@@ -77,28 +77,6 @@ def set_attribute(G, SHPC, orientation):
)
-def partition_graph_date(A, e_overestim):
- """Add subgraphs in pygraphviz graph, one subgraph for each date. We
- use the fact that the date can be deduced from the node
- identification number.
-
- """
-
- my_subgraphs = {}
-
- for n in A.iternodes():
- date_index = util_eddies.node_to_date_eddy(
- int(n), e_overestim, only_date=True
- )
-
- if date_index in my_subgraphs:
- my_subgraphs[date_index].append(n)
- else:
- my_subgraphs[date_index] = [n]
-
- for date, s in my_subgraphs.items():
- A.add_subgraph(s, rank="same")
-
if __name__ == "__main__":
import argparse
diff --git a/Trajectories/draw_segments.py b/Trajectories/draw_segments.py
index 302e4b8d..4510d167 100755
--- a/Trajectories/draw_segments.py
+++ b/Trajectories/draw_segments.py
@@ -18,7 +18,7 @@ import itertools
import graph_tool
import pygraphviz as pgv
-import report_graph
+import edgelist_to_Graphviz
import util_eddies
parser = argparse.ArgumentParser(description = __doc__)
@@ -37,7 +37,7 @@ g_out = pgv.AGraph(directed=True)
for v in g_in.vertices():
g_out.add_node(g_in.vp.name[v])
-report_graph.partition_graph_date(g_out, g_in.gp.e_overestim)
+edgelist_to_Graphviz.partition_graph_date(g_out, g_in.gp.e_overestim)
for e in g_in.edges():
source = e.source()
diff --git a/Trajectories/edgelist_to_Graphviz.py b/Trajectories/edgelist_to_Graphviz.py
new file mode 120000
index 00000000..c56d701a
--- /dev/null
+++ b/Trajectories/edgelist_to_Graphviz.py
@@ -0,0 +1 @@
+../Overlap/Analysis/edgelist_to_Graphviz.py
\ No newline at end of file
diff --git a/Trajectories/report_graph.py b/Trajectories/report_graph.py
deleted file mode 120000
index 7a7a4c72..00000000
--- a/Trajectories/report_graph.py
+++ /dev/null
@@ -1 +0,0 @@
-../Overlap/report_graph.py
\ No newline at end of file
--
GitLab