Skip to content

Commit e557b15

Browse files
committed
remove prints
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
1 parent 33ca324 commit e557b15

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/commons/costevaluatorresult/SumMaxPerTimestampCostEvaluatorResult.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,23 @@ public double getCost(Set<String> contingenciesToExclude, Set<String> cnecsToExc
4242
Map<FlowCnec, Double> filteredCnecs = marginPerCnec.entrySet().stream()
4343
.filter(entry -> !cnecsToExclude.contains(entry.getKey().getId()))
4444
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
45-
System.out.println("filtered cnecs: " + filteredCnecs.keySet());
4645
if (filteredCnecs.isEmpty()) {
4746
return -Double.MAX_VALUE;
4847
}
4948

5049
// Compute state wise cost
5150
Map<State, Set<FlowCnec>> flowCnecsPerState = groupFlowCnecsPerState(filteredCnecs.keySet());
5251
Map<State, Double> costPerState = flowCnecsPerState.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> computeCostForState(entry.getValue())));
53-
costPerState.forEach((state, cost) -> System.out.println(state.getId() + " " + cost));
5452

5553
Map<OffsetDateTime, Set<State>> statesToEvaluatePerTimestamp = new HashMap<>();
5654
Set<State> statesToEvaluateWithoutTimestamp = new HashSet<>();
5755

5856
costPerState.keySet().stream().forEach(state -> {
59-
System.out.println("checking state: " + state.getId());
6057
if (statesContingencyMustBeKept(state, contingenciesToExclude)) {
61-
System.out.println("state is to be kept: " + state.getId());
6258
Optional<OffsetDateTime> timestamp = state.getTimestamp();
6359
if (timestamp.isPresent()) {
64-
System.out.println("timestamp present: " + state.getId());
6560
statesToEvaluatePerTimestamp.computeIfAbsent(timestamp.get(), s -> new HashSet<>()).add(state);
6661
} else {
67-
System.out.println("timestamp missing: " + state.getId());
6862
statesToEvaluateWithoutTimestamp.add(state);
6963
}
7064
}

ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/commons/costevaluatorresult/SumMaxPerTimestampCostEvaluatorResultTest.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package com.powsybl.openrao.searchtreerao.commons.costevaluatorresult;
99

1010
import com.powsybl.contingency.Contingency;
11+
import com.powsybl.openrao.commons.OpenRaoException;
1112
import com.powsybl.openrao.commons.Unit;
1213
import com.powsybl.openrao.data.crac.api.State;
1314
import com.powsybl.openrao.data.crac.api.cnec.FlowCnec;
@@ -161,10 +162,15 @@ void testWithoutAnyTimestampWithExclusion() {
161162
addNullTimestamp();
162163
Map<FlowCnec, Double> marginPerCnec = Map.of(flowCnecPreventiveT1, -10.0, flowCnecCurative1T1, -50.0, flowCnecCurative12T1, -40.0, flowCnecCurativeT2, 20.0, flowCnecCurativeT3, -17.0);
163164
SumMaxPerTimestampCostEvaluatorResult evaluatorResult = new SumMaxPerTimestampCostEvaluatorResult(marginPerCnec, List.of(), Unit.MEGAWATT);
164-
assertEquals(50.0, evaluatorResult.getCost(Set.of(), Set.of()));
165-
assertEquals(17.0, evaluatorResult.getCost(Set.of("contingency-1", "contingency-2"), Set.of()));
166-
assertEquals(40.0, evaluatorResult.getCost(Set.of(), Set.of("cnec-curative1")));
167-
assertEquals(17.0, evaluatorResult.getCost(Set.of("contingency-1"), Set.of("cnec-curative1")));
165+
try {
166+
assertEquals(50.0, evaluatorResult.getCost(Set.of(), Set.of()));
167+
assertEquals(17.0, evaluatorResult.getCost(Set.of("contingency-1", "contingency-2"), Set.of()));
168+
assertEquals(40.0, evaluatorResult.getCost(Set.of(), Set.of("cnec-curative1")));
169+
assertEquals(17.0, evaluatorResult.getCost(Set.of("contingency-1"), Set.of("cnec-curative1")));
170+
} catch (NullPointerException e) {
171+
e.printStackTrace();
172+
throw new OpenRaoException(e);
173+
}
168174
}
169175

170176
@Test

0 commit comments

Comments
 (0)