core: core format and check

Signed-off-by: Erashin <[email protected]>

Author: Erashin

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopeSimPath.java

@@ -113,22 +113,18 @@ public double getMinGrade(double begin, double end) {
         var lowestGradient = gradeValues[indexBegin];
         for (int i = indexBegin; i < indexEnd; i++) {
             var grad = gradeValues[i];
-            if (grad < lowestGradient)
-                lowestGradient = grad;
+            if (grad < lowestGradient) lowestGradient = grad;
         }
         return lowestGradient;
     }
 
     /** For a given position, return the index of the position just before in gradePositions */
     public int getIndexBeforePos(double position) {
-        if (position <= gradePositions[0])
-            return 0;
-        if (position >= gradePositions[gradePositions.length - 1])
-            return gradePositions.length - 1;
+        if (position <= gradePositions[0]) return 0;
+        if (position >= gradePositions[gradePositions.length - 1]) return gradePositions.length - 1;
         for (int i = 0; i < gradePositions.length; i++) {
             var pos = gradePositions[i];
-            if (pos > position)
-                return i - 1;
+            if (pos > position) return i - 1;
         }
         return gradePositions.length - 1;
     }

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsRollingStock.java

@@ -20,8 +20,11 @@ public interface PhysicsRollingStock {
     double getRollingResistanceDeriv(double speed);
 
     double getTractionCutOff();
+
     double getTBs1();
+
     double getTBs2();
+
     double getTBe();
 
     /** The emergency braking acceleration which can be applied at a given speed, in m/s^2 */

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/TrainPhysicsIntegrator.java

@@ -1,13 +1,13 @@
 package fr.sncf.osrd.envelope_sim;
 
-import com.google.common.collect.RangeMap;
-import fr.sncf.osrd.envelope_sim.etcs.BrakingType;
-
 import static fr.sncf.osrd.envelope_sim.PhysicsRollingStock.getGradientAcceleration;
 import static fr.sncf.osrd.envelope_sim.PhysicsRollingStock.getMaxEffort;
 import static fr.sncf.osrd.envelope_sim.etcs.ConstantsKt.mRotatingMax;
 import static fr.sncf.osrd.envelope_sim.etcs.ConstantsKt.mRotatingMin;
 
+import com.google.common.collect.RangeMap;
+import fr.sncf.osrd.envelope_sim.etcs.BrakingType;
+
 /**
  * A utility class to help simulate the train, using numerical integration. It's used when
  * simulating the train, and it is passed to speed controllers so they can take decisions about what
@@ -39,8 +39,7 @@ private TrainPhysicsIntegrator(
             Action action,
             double directionSign,
             RangeMap<Double, PhysicsRollingStock.TractiveEffortPoint[]> tractiveEffortCurveMap,
-            BrakingType brakingType
-    ) {
+            BrakingType brakingType) {
         this.rollingStock = rollingStock;
         this.path = path;
         this.action = action;
@@ -86,8 +85,7 @@ private IntegrationStep step(double timeStep, double initialLocation, double ini
     }
 
     private IntegrationStep step(double timeStep, double position, double speed) {
-        if (action == Action.BRAKE)
-            return newtonStep(timeStep, speed, getDeceleration(speed, position), directionSign);
+        if (action == Action.BRAKE) return newtonStep(timeStep, speed, getDeceleration(speed, position), directionSign);
 
         double tractionForce = 0;
         var tractiveEffortCurve = tractiveEffortCurveMap.get(Math.min(Math.max(0, position), path.getLength()));
@@ -104,24 +102,24 @@ private IntegrationStep step(double timeStep, double position, double speed) {
         }
 
         if (action == Action.ACCELERATE) tractionForce = maxTractionForce;
-        double acceleration = computeAcceleration(
-                rollingStock, rollingResistance, weightForce, speed, tractionForce, directionSign);
+        double acceleration =
+                computeAcceleration(rollingStock, rollingResistance, weightForce, speed, tractionForce, directionSign);
         return newtonStep(timeStep, speed, acceleration, directionSign);
     }
 
     private double getDeceleration(double speed, double position) {
-        assert(action == Action.BRAKE);
-        if (brakingType == BrakingType.CONSTANT)
-            return rollingStock.getDeceleration();
-        //TODO: check if we want min or max grade
+        assert (action == Action.BRAKE);
+        if (brakingType == BrakingType.CONSTANT) return rollingStock.getDeceleration();
+        // TODO: check if we want min or max grade
         var grade = getMinGrade(rollingStock, path, position);
         var mRotating = grade >= 0 ? mRotatingMax : mRotatingMin;
         var gradientAcceleration = getGradientAcceleration(grade, mRotating);
         return switch (brakingType) {
             case ETCS_EBD -> -rollingStock.getSafeBrakingAcceleration(speed) + gradientAcceleration;
             case ETCS_SBD -> -rollingStock.getServiceBrakingAcceleration(speed) + gradientAcceleration;
-            case ETCS_GUI -> -rollingStock.getNormalServiceBrakingAcceleration(speed) + gradientAcceleration
-                + rollingStock.getGradientAccelerationCorrection(gradientAcceleration, speed);
+            case ETCS_GUI -> -rollingStock.getNormalServiceBrakingAcceleration(speed)
+                    + gradientAcceleration
+                    + rollingStock.getGradientAccelerationCorrection(gradientAcceleration, speed);
             default -> throw new UnsupportedOperationException("Braking type not supported: " + brakingType);
         };
     }

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/overlays/EnvelopeDeceleration.java

@@ -9,13 +9,12 @@
 public class EnvelopeDeceleration {
     /** Generate a deceleration curve overlay */
     public static void decelerate(
-        EnvelopeSimContext context,
-        double startPosition,
-        double startSpeed,
-        InteractiveEnvelopePartConsumer consumer,
-        double direction,
-        BrakingType brakingType
-    ) {
+            EnvelopeSimContext context,
+            double startPosition,
+            double startSpeed,
+            InteractiveEnvelopePartConsumer consumer,
+            double direction,
+            BrakingType brakingType) {
         if (!consumer.initEnvelopePart(startPosition, startSpeed, direction)) return;
         double position = startPosition;
         double speed = startSpeed;
@@ -28,12 +27,11 @@ public static void decelerate(
     }
 
     public static void decelerate(
-        EnvelopeSimContext context,
-        double startPosition,
-        double startSpeed,
-        InteractiveEnvelopePartConsumer consumer,
-        double direction
-    ) {
+            EnvelopeSimContext context,
+            double startPosition,
+            double startSpeed,
+            InteractiveEnvelopePartConsumer consumer,
+            double direction) {
         decelerate(context, startPosition, startSpeed, consumer, direction, BrakingType.CONSTANT);
     }
 }