Merge branch 'main' into fix_custom_style_nad

Author: flo-dup

.github/workflows/fork-build-tests.yml

@@ -23,19 +23,20 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          cache: 'maven'
 
       - name: Build with Maven (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        run: ./mvnw --batch-mode -P jacoco,checks install
+        run: ./mvnw -B -ntp -Pjacoco install
 
       - name: Build with Maven (Windows)
         if: matrix.os == 'windows-latest'
-        run: mvnw.cmd --batch-mode install
+        run: mvnw.cmd -B -ntp verify -Dpowsybl.checks.skip=true
         shell: cmd
 
       - name: Build with Maven (MacOS)
         if: matrix.os == 'macos-latest'
-        run: ./mvnw --batch-mode install
+        run: ./mvnw -B -ntp verify -Dpowsybl.checks.skip=true
 
       - name: Regroup dependencies in target folders
         if: matrix.os == 'ubuntu-latest'

.github/workflows/fork-sonar.yml

@@ -82,6 +82,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          cache: 'maven'
 
       - name: Download artifact
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

.github/workflows/maven.yml

@@ -24,30 +24,33 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: '21'
+          cache: 'maven'
 
       - name: Build with Maven (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        run: ./mvnw --batch-mode -P jacoco,checks install
+        run: ./mvnw -B -ntp -Pjacoco install
 
       - name: Build with Maven (Windows)
         if: matrix.os == 'windows-latest'
-        run: mvnw.cmd --batch-mode install
+        run: mvnw.cmd -B -ntp verify -Dpowsybl.checks.skip=true
         shell: cmd
 
       - name: Build with Maven (MacOS)
         if: matrix.os == 'macos-latest'
-        run: ./mvnw --batch-mode install
+        run: ./mvnw -B -ntp verify -Dpowsybl.checks.skip=true
 
       - name: Run SonarCloud analysis
         if: matrix.os == 'ubuntu-latest'
         run: >
-          ./mvnw --batch-mode -Pjacoco verify sonar:sonar
+          ./mvnw -B -ntp -DskipTests sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=powsybl-ci-github
           -Dsonar.projectKey=com.powsybl:powsybl-diagram

THIRD-PARTY.properties

@@ -0,0 +1 @@
+net.jcip--jcip-annotations--1.0=Creative Commons Attribution 2.5 Generic License

THIRD-PARTY.txt

@@ -0,0 +1,81 @@
+
+List of third-party dependencies grouped by their license type.
+
+
+    Apache License, Version 2.0
+
+        * Apache Commons CLI (commons-cli:commons-cli:1.9.0 - https://commons.apache.org/proper/commons-cli/)
+        * Apache Commons Codec (commons-codec:commons-codec:1.17.1 - https://commons.apache.org/proper/commons-codec/)
+        * Apache Commons Compress (org.apache.commons:commons-compress:1.27.1 - https://commons.apache.org/proper/commons-compress/)
+        * Apache Commons IO (commons-io:commons-io:2.19.0 - https://commons.apache.org/proper/commons-io/)
+        * Apache Commons Lang (org.apache.commons:commons-lang3:3.18.0 - https://commons.apache.org/proper/commons-lang/)
+        * Apache Commons Math (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/)
+        * Apache Commons Text (org.apache.commons:commons-text:1.13.1 - https://commons.apache.org/proper/commons-text)
+        * Apache ServiceMix :: Bundles :: gdata (org.apache.servicemix.bundles:org.apache.servicemix.bundles.gdata:1.47.1_1 - http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.gdata/)
+        * Auto Common Libraries (com.google.auto:auto-common:1.2.1 - https://github.com/google/auto/tree/master/common)
+        * AutoService (com.google.auto.service:auto-service-annotations:1.1.1 - https://github.com/google/auto/tree/main/service)
+        * AutoService Processor (com.google.auto.service:auto-service:1.1.1 - https://github.com/google/auto/tree/main/service)
+        * EJML (org.ejml:ejml-core:0.44.0 - http://ejml.org/)
+        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.36.0 - https://errorprone.info/error_prone_annotations)
+        * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
+        * graphviz-builder (org.anarres.graphviz:graphviz-builder:1.0.12 - https://github.com/shevek/graphviz4j)
+        * Guava: Google Core Libraries for Java (com.google.guava:guava:33.4.8-jre - https://github.com/google/guava)
+        * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.3 - https://github.com/google/guava/failureaccess)
+        * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
+        * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.0.0 - https://github.com/google/j2objc/)
+        * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.19.0 - https://github.com/FasterXML/jackson)
+        * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.19.0 - https://github.com/FasterXML/jackson-core)
+        * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.19.0 - https://github.com/FasterXML/jackson)
+        * Java UUID Generator (com.fasterxml.uuid:java-uuid-generator:4.3.0 - https://github.com/cowtowncoder/java-uuid-generator)
+        * JHeaps (org.jheaps:jheaps:0.14 - http://www.jheaps.org)
+        * JSpecify annotations (org.jspecify:jspecify:1.0.0 - http://jspecify.org/)
+        * MAT File Library / Core (us.hebi.matlab.mat:mfl-core:0.5.15 - https://github.com/HebiRobotics/MFL/mfl-core)
+        * MAT File Library / EJML (us.hebi.matlab.mat:mfl-ejml:0.5.15 - https://github.com/HebiRobotics/MFL/mfl-ejml)
+        * SIROCCO ::  Text Table Formatter (org.ow2.sirocco:sirocco-text-table-formatter:1.0 - http://www.ow2.org/sirocco-text-table-formatter)
+        * SnakeYAML (org.yaml:snakeyaml:2.4 - https://bitbucket.org/snakeyaml/snakeyaml)
+        * univocity-parsers (com.univocity:univocity-parsers:2.9.0 - http://github.com/univocity/univocity-parsers)
+
+    BSD 0-clause License
+
+        * XZ for Java (org.tukaani:xz:1.10 - https://tukaani.org/xz/java.html)
+
+    BSD 2-clause License
+
+        * Native Library Loader (org.scijava:native-lib-loader:2.5.0 - https://github.com/scijava/native-lib-loader)
+        * StAX Utilities Project (net.java.dev.stax-utils:stax-utils:20070216 - http://java.net/projects/stax-utils/)
+        * zstd-jni (com.github.luben:zstd-jni:1.5.7-3 - https://github.com/luben/zstd-jni)
+
+    BSD 3-clause License
+
+        * ANTLR 3 Runtime (org.antlr:antlr-runtime:3.5.3 - http://www.antlr.org)
+        * StringTemplate 4 (org.antlr:ST4:4.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/ST4)
+
+    Creative Commons Attribution 2.5 Generic License
+
+        * "Java Concurrency in Practice" book annotations (net.jcip:jcip-annotations:1.0 - http://jcip.net/)
+
+    Eclipse Public License - v 1.0, GNU Lesser General Public License v2.1
+
+        * Logback Core Module (ch.qos.logback:logback-core:1.5.19 - http://logback.qos.ch/logback-core)
+
+    Eclipse Public License - v 2.0, GNU Lesser General Public License v2.1
+
+        * JGraphT - Core (org.jgrapht:jgrapht-core:1.5.2 - http://www.jgrapht.org/jgrapht-core)
+
+    GNU Lesser General Public License v2.1
+
+        * FindBugs-Annotations (com.google.code.findbugs:annotations:3.0.1 - http://findbugs.sourceforge.net/)
+        * GNU Trove (net.sf.trove4j:trove4j:3.0.3 - http://trove4j.sf.net)
+
+    Go License
+
+        * RE2/J (com.google.re2j:re2j:1.8 - http://github.com/google/re2j)
+
+    MIT License
+
+        * apfloat (org.apfloat:apfloat:1.10.1 - http://www.apfloat.org)
+        * SLF4J API Module (org.slf4j:slf4j-api:2.0.17 - http://www.slf4j.org)
+
+    Public Domain
+
+        * JAMA (gov.nist.math:jama:1.0.3 - http://math.nist.gov/javanumerics/jama/)

diagram-util/src/main/java/com/powsybl/diagram/util/layout/algorithms/Atlas2ForceLayoutAlgorithm.java

@@ -65,7 +65,8 @@ public class Atlas2ForceLayoutAlgorithm<V, E> implements LayoutAlgorithm<V, E> {
     public Atlas2ForceLayoutAlgorithm(Atlas2Parameters layoutParameters) {
         this.forces.add(new RepulsionForceDegreeBasedLinear<>(
                 layoutParameters.getRepulsionIntensity(),
-                layoutParameters.isRepulsionFromFixedPointsEnabled()));
+                true
+        ));
         this.forces.add(new EdgeAttractionForceLinear<>(layoutParameters.getEdgeAttractionIntensity()));
         if (layoutParameters.isAttractToCenterEnabled()) {
             // Atlas2 talks about both a unit gravity force and a linear gravity force

diagram-util/src/main/java/com/powsybl/diagram/util/layout/algorithms/parameters/Atlas2Parameters.java

@@ -19,7 +19,6 @@ public final class Atlas2Parameters {
     private static final double DEFAULT_MAX_SPEED_FACTOR = 10;
     private static final double DEFAULT_SWING_TOLERANCE = 1;
     private static final double DEFAULT_MAX_GLOBAL_SPEED_INCREASE_RATIO = 1.5;
-    private static final boolean DEFAULT_REPULSION_FROM_FIXED_POINTS_ENABLED = true;
     private static final boolean DEFAULT_ATTRACT_TO_CENTER_ENABLED = true;
 
     private final int maxSteps;
@@ -30,7 +29,6 @@ public final class Atlas2Parameters {
     private final double maxSpeedFactor;
     private final double swingTolerance;
     private final double maxGlobalSpeedIncreaseRatio;
-    private final boolean repulsionFromFixedPointsEnabled;
     private final boolean attractToCenterEnabled;
 
     private Atlas2Parameters(
@@ -42,7 +40,6 @@ private Atlas2Parameters(
             double maxSpeedFactor,
             double swingTolerance,
             double maxGlobalSpeedIncreaseRatio,
-            boolean repulsionFromFixedPointsEnabled,
             boolean attractToCenterEnabled
     ) {
         this.maxSteps = maxSteps;
@@ -53,7 +50,6 @@ private Atlas2Parameters(
         this.maxSpeedFactor = maxSpeedFactor;
         this.swingTolerance = swingTolerance;
         this.maxGlobalSpeedIncreaseRatio = maxGlobalSpeedIncreaseRatio;
-        this.repulsionFromFixedPointsEnabled = repulsionFromFixedPointsEnabled;
         this.attractToCenterEnabled = attractToCenterEnabled;
     }
 
@@ -66,7 +62,6 @@ public static class Builder {
         private double maxSpeedFactor = DEFAULT_MAX_SPEED_FACTOR;
         private double swingTolerance = DEFAULT_SWING_TOLERANCE;
         private double maxGlobalSpeedIncreaseRatio = DEFAULT_MAX_GLOBAL_SPEED_INCREASE_RATIO;
-        private boolean repulsionFromFixedPointsEnabled = DEFAULT_REPULSION_FROM_FIXED_POINTS_ENABLED;
         private boolean attractToCenterEnabled = DEFAULT_ATTRACT_TO_CENTER_ENABLED;
 
         /**
@@ -164,17 +159,6 @@ public Builder withMaxGlobalSpeedIncreaseRatio(double maxGlobalSpeedIncreaseRati
             return this;
         }
 
-        /**
-         * If set to true, other points will get a repulsion effect from unmovable points (fixed points),
-         * default is {@value DEFAULT_REPULSION_FROM_FIXED_POINTS_ENABLED}
-         * @param repulsionFromFixedPointsEnabled whether you want to activate repulsion from fixed points or not
-         * @return the instance of this Builder with the `repulsionFromFixedPointsEnabled` changed
-         */
-        public Builder withRepulsionFromFixedPointsEnabled(boolean repulsionFromFixedPointsEnabled) {
-            this.repulsionFromFixedPointsEnabled = repulsionFromFixedPointsEnabled;
-            return this;
-        }
-
         /**
          * Activate or deactivate the force that attracts points to the center of the graph. It is used to prevent non-connected points
          * from drifting away, default is {@value DEFAULT_ATTRACT_TO_CENTER_ENABLED}
@@ -196,7 +180,6 @@ public Atlas2Parameters build() {
                     maxSpeedFactor,
                     swingTolerance,
                     maxGlobalSpeedIncreaseRatio,
-                    repulsionFromFixedPointsEnabled,
                     attractToCenterEnabled
             );
         }
@@ -234,10 +217,6 @@ public double getMaxGlobalSpeedIncreaseRatio() {
         return maxGlobalSpeedIncreaseRatio;
     }
 
-    public boolean isRepulsionFromFixedPointsEnabled() {
-        return repulsionFromFixedPointsEnabled;
-    }
-
     public boolean isAttractToCenterEnabled() {
         return attractToCenterEnabled;
     }

diagram-util/src/test/java/com/powsybl/diagram/util/layout/algorithms/parameters/Atlas2ParametersTest.java

@@ -24,7 +24,6 @@ class Atlas2ParametersTest {
     double maxSpeedFactor = 12.45;
     double swingTolerance = 0.8;
     double maxGlobalSpeedIncreaseRatio = 1.69;
-    boolean repulsionFromFixedPointsEnabled = false;
     boolean attractToCenterEnabled = false;
 
     @Test
@@ -38,7 +37,6 @@ void checkBuilder() {
                 .withMaxSpeedFactor(maxSpeedFactor)
                 .withSwingTolerance(swingTolerance)
                 .withMaxGlobalSpeedIncreaseRatio(maxGlobalSpeedIncreaseRatio)
-                .withRepulsionFromFixedPointsEnabled(repulsionFromFixedPointsEnabled)
                 .withAttractToCenterEnabled(attractToCenterEnabled)
                 .build();
 
@@ -50,7 +48,6 @@ void checkBuilder() {
         assertEquals(maxSpeedFactor, parameters.getMaxSpeedFactor());
         assertEquals(swingTolerance, parameters.getSwingTolerance());
         assertEquals(maxGlobalSpeedIncreaseRatio, parameters.getMaxGlobalSpeedIncreaseRatio());
-        assertEquals(repulsionFromFixedPointsEnabled, parameters.isRepulsionFromFixedPointsEnabled());
         assertEquals(attractToCenterEnabled, parameters.isAttractToCenterEnabled());
     }
 }

docs/network_area_diagrams/layout/atlas2Parameters.md

@@ -35,7 +35,6 @@ Note that once created, atlas2ForceLayout can be used on multiple different grap
 | $maxSpeedFactor$                        | `double`  | 10            | $\gt speedFactor$ |
 | $swingTolerance$                        | `double`  | 1             | $\gt$ 0           |
 | $maxGlobalSpeedIncreaseRatio$           | `double`  | 1.5           | $\gt$ 1           |
-| $activateRepulsionForceFromFixedPoints$ | `boolean` | true          | true / false      |
 | $activateAttractToCenterForce$          | `boolean` | true          | true / false      |
 
 ### maxSteps
@@ -125,16 +124,6 @@ Atlas2Parameters atlas2Parameters = new Atlas2Parameters.Builder().withMaxGlobal
 
 ![ieee_118-maxGlobalSpeedIncreaseRatio_1.1.svg](/_static/img/nad/atlas2/ieee_118-maxGlobalSpeedIncreaseRatio_1.1.svg)
 
-### activateRepulsionForceFromFixedPoints
-
-If set to true, other points will get a repulsion effect from unmovable points (fixed points), otherwise fixed points do not repel other points.
-
-```java
-Atlas2Parameters atlas2Parameters = new Atlas2Parameters.Builder().withActivateRepulsionForceFromFixedPoints(false).build();
-```
-
-Identical to default, there are no fixed points in the ieee 118 graph
-
 ### activateAttractToCenterForce
 
 Activate or deactivate the force that attracts points to the center of the graph. It is used to prevent non-connected points 

network-area-diagram/src/main/java/com/powsybl/nad/build/iidm/NetworkGraphBuilder.java

@@ -104,6 +104,16 @@ private void fillInjectionsMap(VoltageLevel vl, Graph graph, Map<String, List<In
         vl.getShuntCompensators().forEach(sc -> addInjection(graph, sc, injectionsMap));
         vl.getBatteries().forEach(b -> addInjection(graph, b, injectionsMap));
         vl.getStaticVarCompensators().forEach(svc -> addInjection(graph, svc, injectionsMap));
+        vl.getVscConverterStations().forEach(vsc -> {
+            if (vsc.getHvdcLine() == null) {
+                addInjection(graph, vsc, injectionsMap);
+            }
+        });
+        vl.getLccConverterStations().forEach(lcc -> {
+            if (lcc.getHvdcLine() == null) {
+                addInjection(graph, lcc, injectionsMap);
+            }
+        });
     }
 
     private void addInjection(Graph graph, com.powsybl.iidm.network.Injection<?> inj, Map<String, List<Injection>> injectionsMap) {
@@ -129,10 +139,18 @@ private static Injection.Type getInjectionType(com.powsybl.iidm.network.Injectio
             case LOAD -> Injection.Type.LOAD;
             case SHUNT_COMPENSATOR -> getShuntCompensatorType((ShuntCompensator) inj);
             case STATIC_VAR_COMPENSATOR -> Injection.Type.STATIC_VAR_COMPENSATOR;
+            case HVDC_CONVERTER_STATION -> getInjectionTypeForHvdcConverterStation((HvdcConverterStation<?>) inj);
             default -> throw new AssertionError("Unexpected injection type: " + inj.getType());
         };
     }
 
+    private static Injection.Type getInjectionTypeForHvdcConverterStation(HvdcConverterStation<?> hvdcConverterStation) {
+        return switch (hvdcConverterStation.getHvdcType()) {
+            case LCC -> Injection.Type.LCC;
+            case VSC -> Injection.Type.VSC;
+        };
+    }
+
     private static Injection.Type getShuntCompensatorType(ShuntCompensator shuntCompensator) {
         return IidmUtil.isCapacitor(shuntCompensator) ? Injection.Type.SHUNT_COMPENSATOR_CAPACITOR : Injection.Type.SHUNT_COMPENSATOR_INDUCTOR;
     }
@@ -191,7 +209,7 @@ private void visitTieLine(TieLine tieLine, DanglingLine dl, Graph graph) {
     private void visitHvdcConverterStation(HvdcConverterStation<?> converterStation, Graph graph) {
         // check if the hvdc line was not already added (at the other side of the line)
         HvdcLine hvdcLine = converterStation.getHvdcLine();
-        if (graph.containsEdge(hvdcLine.getId())) {
+        if (hvdcLine == null || graph.containsEdge(hvdcLine.getId())) {
             return;
         }