From 459a1b62b5c212f5a70a6f46ca55b3606633fc31 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Wed, 29 May 2024 11:14:10 +0200
Subject: [PATCH] Add option `--avg_fix`
Add option `--avg_fix` in tests to reproduce previous behaviour.
---
Trajectories/Tests/perf_tests.json | 2 +-
Trajectories/Tests/tests.json | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Trajectories/Tests/perf_tests.json b/Trajectories/Tests/perf_tests.json
index 88162b77..5e1e3520 100644
--- a/Trajectories/Tests/perf_tests.json
+++ b/Trajectories/Tests/perf_tests.json
@@ -11,7 +11,7 @@
"Perf_cost_function": {
"description": "Performance test with adjustable size of input.",
"command": [
- "$src_dir/Trajectories/cost_function.py",
+ "$src_dir/Trajectories/cost_function.py", "--avg_fix",
"$my_data_dir/Global_1993_2023/SHPC",
"Anticyclones",
"$PWD/Perf_segments/segments.gt",
diff --git a/Trajectories/Tests/tests.json b/Trajectories/Tests/tests.json
index 274806e9..f69e57f5 100644
--- a/Trajectories/Tests/tests.json
+++ b/Trajectories/Tests/tests.json
@@ -40,7 +40,7 @@
},
"Cost_functions": {
"command": [
- "$src_dir/Trajectories/cost_function.py",
+ "$src_dir/Trajectories/cost_function.py", "--avg_fix",
"$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
"Anticyclones",
"$tests_old_dir/Segments/segments.graphml",
@@ -60,7 +60,7 @@
"Greece_cost_function": {
"description": "This is a case where the speed is not defined on a whole segment. It can be seen in the properties first_av_ros or last_av_ros.",
"command": [
- "$src_dir/Trajectories/cost_function.py",
+ "$src_dir/Trajectories/cost_function.py", "--avg_fix",
"$tests_old_dir/Greece/SHPC",
"Anticyclones",
"$tests_old_dir/Greece_segments/segments.graphml",
@@ -73,7 +73,7 @@
"description": "Like Greece_cost_function but without option --debug.",
"command":
[
- "$src_dir/Trajectories/cost_function.py",
+ "$src_dir/Trajectories/cost_function.py", "--avg_fix",
"$tests_old_dir/Greece/SHPC", "Anticyclones",
"$tests_old_dir/Greece_segments/segments.graphml",
"segments_cost_functions.graphml"
@@ -110,7 +110,7 @@
"I want a larger case than Greece to test script cost_function.py.",
"command":
[
- "$src_dir/Trajectories/cost_function.py",
+ "$src_dir/Trajectories/cost_function.py", "--avg_fix",
"$my_data_dir/Eurec4A/SHPC", "Anticyclones",
"$tests_old_dir/Eurec4A_segments/segments.graphml",
"segments_cost.graphml"
--
GitLab