Remove Atlas2 RepulsionFromFixedNodes parameter

Signed-off-by: Nathan Dissoubray <nathan.dissoubray@rte-france.com>

Author: NathanDissoubray

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());
     }
 }