From 3f3122fbb24a00ed265e1e9256e17f2f600c99f7 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Wed, 21 Feb 2024 17:40:49 +0100
Subject: [PATCH] Move part of tests to new test series
Move part of tests to new test series in sub-directory.
---
Overlap/Analysis/tests.json | 80 ++++++++++++++++++++++++++++++++++
Overlap/Tests/short_tests.json | 78 ---------------------------------
2 files changed, 80 insertions(+), 78 deletions(-)
create mode 100644 Overlap/Analysis/tests.json
diff --git a/Overlap/Analysis/tests.json b/Overlap/Analysis/tests.json
new file mode 100644
index 00000000..4c3e0e74
--- /dev/null
+++ b/Overlap/Analysis/tests.json
@@ -0,0 +1,80 @@
+{
+ "Report_graph_cyclo": {
+ "command": [
+ "$src_dir/Overlap/Analysis/report_graph.py",
+ "--gv",
+ "--merging",
+ "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv"
+ ]
+ },
+ "Report_graph_anti": {
+ "command": [
+ "$src_dir/Overlap/Analysis/report_graph.py",
+ "--gv",
+ "--merging",
+ "$tests_old_dir/EGr2nd15md4np3/edgelist.csv"
+ ]
+ },
+ "Plot_components": {
+ "command": [
+ "$src_dir/Overlap/Analysis/plot_components.py",
+ "$tests_old_dir/EGr2nd15md4np3/edgelist.csv",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "--save=png"
+ ]
+ },
+ "Report_graph_int": {
+ "command": [
+ "$src_dir/Overlap/Analysis/report_graph.py",
+ "--gv",
+ "--merging",
+ "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist.csv"
+ ]
+ },
+ "Plot_components_date": {
+ "description": "plot_components.py with option node and option label with an integer value, so is_node_type is called with an integer value for label.",
+ "command": [
+ "$src_dir/Overlap/Analysis/plot_components.py",
+ "$tests_old_dir/EGr2nd15md4np3/edgelist.csv",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "--save=png",
+ "--node=204618",
+ "--label_date=20461"
+ ]
+ },
+ "Extract_component":
+ {
+ "command":
+ [
+ "$src_dir/Overlap/Analysis/extract_component.py",
+ "$my_data_dir/Eurec4A/Graph_anti/segments_cost.gt",
+ "1980897", "component_1980897.graphml"
+ ]
+ },
+ "Extract_component_CSV":
+ {
+ "description": "Extract component from an edgelist.",
+ "command":
+ [
+ "$src_dir/Overlap/Analysis/extract_component.py",
+ "$my_data_dir/Eurec4A/Graph_anti/edgelist.csv",
+ "1980897", "component_1980897.graphml"
+ ]
+ },
+ "Edgelist_to_Graphviz":
+ {
+ "command":
+ [
+ "$src_dir/Overlap/Analysis/edgelist_to_Graphviz.py",
+ "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv", "eddy_graph.gv"
+ ]
+ },
+ "Extract_component_nx":
+ {
+ "command":
+ ["$src_dir/Overlap/Analysis/extract_component_nx.py",
+ "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv", "286461"]
+ }
+}
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index 006e0103..31c03704 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -459,39 +459,6 @@
"$tests_old_dir/Region_5_15_days/SHPC"
]
},
- "Report_graph_cyclo": {
- "command": [
- "$src_dir/Overlap/Analysis/report_graph.py",
- "--gv",
- "--merging",
- "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv"
- ]
- },
- "Report_graph_anti": {
- "command": [
- "$src_dir/Overlap/Analysis/report_graph.py",
- "--gv",
- "--merging",
- "$tests_old_dir/EGr2nd15md4np3/edgelist.csv"
- ]
- },
- "Plot_components": {
- "command": [
- "$src_dir/Overlap/Analysis/plot_components.py",
- "$tests_old_dir/EGr2nd15md4np3/edgelist.csv",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones",
- "--save=png"
- ]
- },
- "Report_graph_int": {
- "command": [
- "$src_dir/Overlap/Analysis/report_graph.py",
- "--gv",
- "--merging",
- "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist.csv"
- ]
- },
"Read_eddy_missing_speed": {
"commands": [
[
@@ -588,18 +555,6 @@
],
"input": "&CONFIG_GRAPH_NML MAX_DELTA=4, cyclone = f/\n&MAIN_NML /\n"
},
- "Plot_components_date": {
- "description": "plot_components.py with option node and option label with an integer value, so is_node_type is called with an integer value for label.",
- "command": [
- "$src_dir/Overlap/Analysis/plot_components.py",
- "$tests_old_dir/EGr2nd15md4np3/edgelist.csv",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones",
- "--save=png",
- "--node=204618",
- "--label_date=20461"
- ]
- },
"Greece_graph": {
"description": "This is a case where the speed is not defined on a whole segment.",
"command": [
@@ -623,38 +578,5 @@
]
],
"input": "&main_nml cyclone = t, grid_lon_lat = f/\n"
- },
- "Extract_component":
- {
- "command":
- [
- "$src_dir/Overlap/Analysis/extract_component.py",
- "$my_data_dir/Eurec4A/Graph_anti/segments_cost.gt",
- "1980897", "component_1980897.graphml"
- ]
- },
- "Extract_component_CSV":
- {
- "description": "Extract component from an edgelist.",
- "command":
- [
- "$src_dir/Overlap/Analysis/extract_component.py",
- "$my_data_dir/Eurec4A/Graph_anti/edgelist.csv",
- "1980897", "component_1980897.graphml"
- ]
- },
- "Edgelist_to_Graphviz":
- {
- "command":
- [
- "$src_dir/Overlap/Analysis/edgelist_to_Graphviz.py",
- "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv", "eddy_graph.gv"
- ]
- },
- "Extract_component_nx":
- {
- "command":
- ["$src_dir/Overlap/Analysis/extract_component_nx.py",
- "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv", "286461"]
}
}
--
GitLab