Solve compile issues

powsybl · Jul 9, 2019 · caa0df8 · caa0df8
1 parent 315797d
commit caa0df8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...mmunity/farao/flow_decomposition/full_line_decomposition/FlowDecompositionCalculator.java b/...mmunity/farao/flow_decomposition/full_line_decomposition/FlowDecompositionCalculator.java
@@ -132,8 +132,8 @@ private void decomposeFlow(MonitoredBranch monitoredBranch, FlowDecompositionRes
         int branchIndex = branchMapper.get(branch);
         for (Bus busFrom : busesOfInterest) {
             for (Bus busTo : busesOfInterest) {
-                Country countryFrom = busFrom.getVoltageLevel().getSubstation().getCountry();
-                Country countryTo = busTo.getVoltageLevel().getSubstation().getCountry();
+                Country countryFrom = busFrom.getVoltageLevel().getSubstation().getCountry().orElse(null);
+                Country countryTo = busTo.getVoltageLevel().getSubstation().getCountry().orElse(null);
                 int busFromIndex = busMapper.get(busFrom);
                 int busToIndex = busMapper.get(busTo);
 

diff --git a/...ava/com/farao_community/farao/flow_decomposition/full_line_decomposition/NetworkUtil.java b/...ava/com/farao_community/farao/flow_decomposition/full_line_decomposition/NetworkUtil.java
@@ -61,7 +61,7 @@ public static boolean branchIsPst(Branch branch) {
     }
 
     public static Country getBranchSideCountry(Branch branch, Branch.Side side) {
-        return branch.getTerminal(side).getVoltageLevel().getSubstation().getCountry();
+        return branch.getTerminal(side).getVoltageLevel().getSubstation().getCountry().orElse(null);
     }
 
     public static Injection getInjectionFrom(Network network, String id) {