|
9 | 9 |
|
10 | 10 | import com.powsybl.iidm.network.*; |
11 | 11 | import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; |
12 | | -import com.powsybl.iidm.network.test.FictitiousSwitchFactory; |
13 | 12 | import com.powsybl.math.graph.TraverseResult; |
14 | 13 | import org.apache.commons.lang3.tuple.Pair; |
15 | 14 | import org.junit.jupiter.api.Test; |
@@ -260,33 +259,22 @@ void testTerminateTraverser() { |
260 | 259 | List<Pair<String, Integer>> visited1 = getVisitedList(startGNbv, s -> s != null && s.getId().equals("BR2") ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE); |
261 | 260 | assertEquals(List.of(Pair.of("G", 0), Pair.of("BBS1", 0)), visited1); |
262 | 261 |
|
263 | | - List<Pair<String, Integer>>visited2 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER); |
| 262 | + List<Pair<String, Integer>> visited2 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER); |
264 | 263 | assertEquals(List.of(Pair.of("G", 0)), visited2); |
265 | 264 |
|
266 | | - List<Pair<String, Integer>>visited3 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, |
| 265 | + List<Pair<String, Integer>> visited3 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, |
267 | 266 | t -> t.getConnectable() instanceof BusbarSection ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE); |
268 | 267 | assertEquals(List.of(Pair.of("G", 0), Pair.of("BBS1", 0)), visited3); |
269 | 268 |
|
270 | 269 | Terminal startLBbv = network.getLoad("LD2").getTerminal(); |
271 | 270 | List<Pair<String, Integer>>visited4 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER); |
272 | 271 | assertEquals(List.of(Pair.of("LD2", 0)), visited4); |
273 | 272 |
|
274 | | - List<Pair<String, Integer>>visited5 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE, |
| 273 | + List<Pair<String, Integer>> visited5 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE, |
275 | 274 | t -> t.getConnectable().getId().equals("L2") ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE); |
276 | 275 | assertEquals(List.of(Pair.of("LD2", 0), Pair.of("L2", 1)), visited5); |
277 | 276 | } |
278 | 277 |
|
279 | | - @Test |
280 | | - void testTraversalOrder() { |
281 | | - Network network = FictitiousSwitchFactory.create(); |
282 | | - List<Pair<String, Integer>> visited = getVisitedList(network.getGenerator("CB").getTerminal(), s -> TraverseResult.CONTINUE); |
283 | | - assertEquals(List.of(Pair.of("CB", 0), Pair.of("O", 0), Pair.of("P", 0), Pair.of("CF", 0), |
284 | | - Pair.of("CH", 0), Pair.of("CC", 0), Pair.of("CD", 0), Pair.of("CE", 0), |
285 | | - Pair.of("CJ", 1), Pair.of("CI", 1), Pair.of("CG", 0), Pair.of("CJ", 0), |
286 | | - Pair.of("D", 0), Pair.of("CI", 0)), |
287 | | - visited); |
288 | | - } |
289 | | - |
290 | 278 | protected List<Pair<String, Integer>> getVisitedList(Terminal start, Function<Switch, TraverseResult> switchTest) { |
291 | 279 | return getVisitedList(start, switchTest, t -> TraverseResult.CONTINUE); |
292 | 280 | } |
|
0 commit comments