From ca790d75681951cf31b671bd71afffeb7e28ba00 Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Fri, 1 Dec 2023 15:41:52 +0100 Subject: [PATCH] Polish --- Trajectories/Documentation_texfol/documentation.tex | 5 +++-- Trajectories/Tests/tests.json | 4 ++-- Trajectories/extract_component.py | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Trajectories/Documentation_texfol/documentation.tex b/Trajectories/Documentation_texfol/documentation.tex index 87537653..453a01e3 100644 --- a/Trajectories/Documentation_texfol/documentation.tex +++ b/Trajectories/Documentation_texfol/documentation.tex @@ -82,8 +82,9 @@ jonction. Ou bien utilisation de la fonction de coût de Le Vu (2018 k1000). \verb+cost_function.py+. En extrayant les $10^6$ premières arêtes dans -le graphe des tourbillons instantanés, les tourbillons sont étalés sur -un an environ. Le graphe des segments contient environ \np{8e4} +le graphe des tourbillons instantanés du domaine global Aviso +1993-2023, les tourbillons sont étalés sur un an environ. Le graphe +des segments contient environ \np{8e4} noeuds. Cf. \href{../experiences.ods}{expériences}. Pour lire dans Networkx un graphe de Graph-tool créé par diff --git a/Trajectories/Tests/tests.json b/Trajectories/Tests/tests.json index e804a6ec..1f0859c9 100644 --- a/Trajectories/Tests/tests.json +++ b/Trajectories/Tests/tests.json @@ -176,7 +176,7 @@ }, "Traj_component": { - "description": "Recompute trajectories on an extracted component.", + "description": "Recompute trajectories on an extracted component. This is also an example where we have a splitting event immediately followed by a merging, but not a phantom pattern because the date interval is > 6.", "command": [ "$src_dir/Trajectories/trajectories.py", @@ -185,7 +185,7 @@ }, "Component_60148580": { - "description": "The input file is extracted from Global_1993_2023/Graph_anti. This is a case where the test on in-degrees and out-degrees in trajectory.py is important.", + "description": "The input file is extracted from Global_1993_2023/Graph_anti. This is a case where the test on in-degrees and out-degrees in trajectories.py is important.", "command": [ "$src_dir/Trajectories/trajectories.py", diff --git a/Trajectories/extract_component.py b/Trajectories/extract_component.py index 718dc23a..d4aec35e 100755 --- a/Trajectories/extract_component.py +++ b/Trajectories/extract_component.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 -import graph_tool import csv -from graph_tool import topology import pathlib import sys +import graph_tool +from graph_tool import topology + if len(sys.argv) != 4: sys.exit("Required arguments: input-file node-number output-file") -- GitLab