fix checkstyle

Signed-off-by: Gael Macherel <gael.macherel@artelys.com>
powsybl · Dec 3, 2020 · 76dc05f · 76dc05f
1 parent a628029
commit 76dc05f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/...in/java/com/powsybl/openloadflow/dc/equations/AbstractClosedBranchDcFlowEquationTerm.java b/...in/java/com/powsybl/openloadflow/dc/equations/AbstractClosedBranchDcFlowEquationTerm.java
@@ -71,8 +71,4 @@ public List<Variable> getVariables() {
     public boolean hasRhs() {
         return true;
     }
-
-    public double getPower() {
-        return power;
-    }
 }
diff --git a/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java
@@ -14,7 +14,6 @@
 import com.powsybl.openloadflow.OpenLoadFlowParameters;
 import com.powsybl.openloadflow.ac.AbstractDistributedSlackOuterLoop;
 import com.powsybl.openloadflow.ac.DistributedSlackOnGenerationOuterLoop;
-import com.powsybl.openloadflow.ac.DistributedSlackOnLoadOuterLoop;
 import com.powsybl.openloadflow.dc.equations.ClosedBranchSide1DcFlowEquationTerm;
 import com.powsybl.openloadflow.dc.equations.DcEquationSystem;
 import com.powsybl.openloadflow.dc.equations.DcEquationSystemCreationParameters;
@@ -29,8 +28,6 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
-import java.util.stream.Collectors;
-
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
@@ -202,14 +199,15 @@ private Map<SensitivityVariableConfiguration, SensitivityFactorGroup> indexFacto
      * @param oldFactors
      * @return
      */
-    private List<SensitivityFactor> getDistributedFactors(Network network, LfNetwork lfNetwork, List<SensitivityFactor> oldFactors) {
+    private List<SensitivityFactor> getDistributedFactors(Network network, LfNetwork lfNetwork,
+                                                          List<SensitivityFactor> oldFactors) {
         // todo: load ?
         // todo: use only lfnetwork ?
 
         List<SensitivityFactor> factors = new ArrayList<>();
 
         Set<String> monitoredLines = new HashSet<>();
-        for (SensitivityFactor oldFactor: oldFactors) {
+        for (SensitivityFactor oldFactor : oldFactors) {
             // if the factor if an injection then we will compute it with distribution, otherwise we just keep it as it is
             if (oldFactor instanceof BranchFlowPerInjectionIncrease) {
                 BranchFlowPerInjectionIncrease branchFactor = (BranchFlowPerInjectionIncrease) oldFactor;
@@ -220,19 +218,24 @@ private List<SensitivityFactor> getDistributedFactors(Network network, LfNetwork
         }
 
         monitoredLines.forEach(
-                lineId -> {
-                    // todo: check that the line is still in the connected component ?
-                    BranchFlow branchFlow = new BranchFlow(lineId, lineId, lineId);
-                    network.getGenerators().forEach( // todo: not all generators, only those who have an impact in compensation
-                            generator -> {
-                                if (generator.getTerminal().getBusView().getBus() == null) return;
-                                if (lfNetwork.getBusById(generator.getTerminal().getBusView().getBus().getId()) == null) return; // check connected component
-                                String genId = generator.getId();
-                                factors.add(new BranchFlowPerInjectionIncrease(branchFlow,
-                                        new InjectionIncrease(genId, genId, genId)));
-                            }
-                    );
-                }
+            lineId -> {
+                // todo: check that the line is still in the connected component ?
+                BranchFlow branchFlow = new BranchFlow(lineId, lineId, lineId);
+                network.getGenerators().forEach(// todo: not all generators, only those who have an impact in compensation
+                    generator -> {
+                        if (generator.getTerminal().getBusView().getBus() == null) {
+                            return;
+                        }
+                        // check connected component
+                        if (lfNetwork.getBusById(generator.getTerminal().getBusView().getBus().getId()) == null) {
+                            return;
+                        }
+                        String genId = generator.getId();
+                        factors.add(new BranchFlowPerInjectionIncrease(branchFlow,
+                                new InjectionIncrease(genId, genId, genId)));
+                    }
+                );
+            }
         );
         return factors;
     }
@@ -299,7 +302,7 @@ public List<SensitivityValue> analyse(Network network, List<SensitivityFactor> f
         // index factors by variable configuration to compute minimal number of DC state
         Map<SensitivityVariableConfiguration, SensitivityFactorGroup> factorsByVarConfig = lfParameters.isDistributedSlack()
                 ? indexFactorsByVariableConfig(network, getDistributedFactors(network, lfNetwork, factors)) // if the slack is distributed we need to compute sensi for all generators
-                : indexFactorsByVariableConfig(network, factors);;
+                : indexFactorsByVariableConfig(network, factors);
 
         if (factorsByVarConfig.isEmpty()) {
             return Collections.emptyList();