From f29bb5d6adb8b60ed512404e055a831c4fd202df Mon Sep 17 00:00:00 2001 From: Florian Dupuy Date: Wed, 24 Jan 2024 16:32:29 +0100 Subject: [PATCH 1/8] Change default time step Signed-off-by: Florian Dupuy --- .../java/com/powsybl/diagram/util/forcelayout/ForceLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java b/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java index 15a9fdfac..664640578 100644 --- a/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java +++ b/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java @@ -58,7 +58,7 @@ public class ForceLayout { private static final int DEFAULT_MAX_STEPS = 1000; private static final double DEFAULT_MIN_ENERGY_THRESHOLD = 0.001; - private static final double DEFAULT_DELTA_TIME = 1; + private static final double DEFAULT_DELTA_TIME = 0.1; private static final double DEFAULT_REPULSION = 800.0; private static final double DEFAULT_FRICTION = 500; private static final double DEFAULT_MAX_SPEED = 100; From 962c1ce281c8b57c6bed95fe85ead9200a0be39d Mon Sep 17 00:00:00 2001 From: Florian Dupuy Date: Wed, 24 Jan 2024 16:33:15 +0100 Subject: [PATCH 2/8] Change default max iteration steps Signed-off-by: Florian Dupuy --- .../java/com/powsybl/diagram/util/forcelayout/ForceLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java b/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java index 664640578..dc05d7c9d 100644 --- a/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java +++ b/diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/ForceLayout.java @@ -56,7 +56,7 @@ public class ForceLayout { /** Deterministic randomness */ private final Random random = new Random(3L); - private static final int DEFAULT_MAX_STEPS = 1000; + private static final int DEFAULT_MAX_STEPS = 400; private static final double DEFAULT_MIN_ENERGY_THRESHOLD = 0.001; private static final double DEFAULT_DELTA_TIME = 0.1; private static final double DEFAULT_REPULSION = 800.0; From cf09b154f6bf16344de8ea54bfb25ed5b3d1188c Mon Sep 17 00:00:00 2001 From: Florian Dupuy Date: Wed, 24 Jan 2024 16:48:08 +0100 Subject: [PATCH 3/8] Update unit tests references Signed-off-by: Florian Dupuy --- .../src/test/resources/3wt.svg | 60 +- .../src/test/resources/3wt_disconnected.svg | 60 +- .../3wt_disconnected_topological.svg | 60 +- .../src/test/resources/3wt_partial.svg | 32 +- .../src/test/resources/IEEE_118_bus.svg | 3958 ++++++++--------- .../test/resources/IEEE_118_bus_partial.svg | 834 ++-- .../IEEE_118_bus_partial_non_connected.svg | 424 +- .../src/test/resources/IEEE_14_bus.svg | 428 +- .../resources/IEEE_14_bus_disconnection.svg | 428 +- .../test/resources/IEEE_14_bus_fictitious.svg | 446 +- .../test/resources/IEEE_14_bus_text_nodes.svg | 446 +- .../test/resources/IEEE_14_id_prefixed.svg | 446 +- .../src/test/resources/IEEE_24_bus.svg | 826 ++-- .../src/test/resources/IEEE_30_bus.svg | 914 ++-- .../src/test/resources/IEEE_57_bus.svg | 1716 +++---- .../src/test/resources/current_limits.svg | 50 +- .../resources/dangling_line_connected.svg | 118 +- .../resources/dangling_line_disconnected.svg | 118 +- .../src/test/resources/detailed_text_node.svg | 50 +- .../detailed_text_node_no_legend.svg | 50 +- .../diamond-spring-repulsion-factor-0.0.svg | 394 +- .../diamond-spring-repulsion-factor-0.2.svg | 394 +- .../src/test/resources/edge_info_current.svg | 50 +- .../resources/edge_info_double_labels.svg | 66 +- .../resources/edge_info_missing_label.svg | 48 +- .../edge_info_perpendicular_label.svg | 64 +- .../resources/edge_info_reactive_power.svg | 50 +- .../src/test/resources/edge_info_shift.svg | 118 +- .../src/test/resources/edge_with_id.svg | 134 +- .../src/test/resources/edge_without_id.svg | 118 +- .../src/test/resources/hvdc-vl-depth-1.svg | 28 +- .../src/test/resources/hvdc.svg | 132 +- .../test/resources/parallel_transformers.svg | 76 +- .../src/test/resources/simple-eu-loop100.svg | 386 +- .../src/test/resources/simple-eu-loop80.svg | 386 +- .../src/test/resources/simple-eu.svg | 386 +- .../src/test/resources/tie_line.svg | 106 +- .../src/test/resources/vl_description_id.svg | 50 +- .../resources/vl_description_substation.svg | 50 +- .../vl_description_substation_id.svg | 50 +- .../src/test/resources/voltage_limits.svg | 68 +- 41 files changed, 7309 insertions(+), 7309 deletions(-) diff --git a/network-area-diagram/src/test/resources/3wt.svg b/network-area-diagram/src/test/resources/3wt.svg index 0b06af3ac..34d524c5f 100644 --- a/network-area-diagram/src/test/resources/3wt.svg +++ b/network-area-diagram/src/test/resources/3wt.svg @@ -1,5 +1,5 @@ - +