Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update FilterIdent with containerId and containerName #33

Merged
merged 4 commits into from
Sep 29, 2023
Merged

update FilterIdent with containerId and containerName #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29e5952
update FilterIdent with filterId and filterName
Sep 14, 2023
5d5ad48
update and fix FilterIdent
Sep 14, 2023
38b768c
change filter by container equipment
Sep 19, 2023
f420c1c
replace ContainerIdent by EquipmentsContainer
Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ivityanalysis/server/dto/FilterIdent.java → ...lysis/server/dto/EquipmentsContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@AllArgsConstructor
@Getter
@Setter
public class FilterIdent {
UUID id;
String name;
public class EquipmentsContainer {
UUID containerId;
String containerName;
}
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/sensitivityanalysis/server/dto/SensitivityHVDC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
@Setter
@Schema(description = "Sensitivity relatively to each HVDC")
public class SensitivityHVDC {
List<FilterIdent> monitoredBranches;
List<EquipmentsContainer> monitoredBranches;

SensitivityAnalysisInputData.SensitivityType sensitivityType;

List<FilterIdent> hvdcs;
List<EquipmentsContainer> hvdcs;

List<FilterIdent> contingencies;
List<EquipmentsContainer> contingencies;
}
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/sensitivityanalysis/server/dto/SensitivityInjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
@Setter
@Schema(description = "Sensitivity relatively to each injection")
public class SensitivityInjection {
List<FilterIdent> monitoredBranches;
List<EquipmentsContainer> monitoredBranches;

List<FilterIdent> injections;
List<EquipmentsContainer> injections;

List<FilterIdent> contingencies;
List<EquipmentsContainer> contingencies;
}

6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/sensitivityanalysis/server/dto/SensitivityInjectionsSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
@Setter
@Schema(description = "Sensitivity relatively to injections set")
public class SensitivityInjectionsSet {
List<FilterIdent> monitoredBranches;
List<EquipmentsContainer> monitoredBranches;

List<FilterIdent> injections;
List<EquipmentsContainer> injections;

SensitivityAnalysisInputData.DistributionType distributionType;

List<FilterIdent> contingencies;
List<EquipmentsContainer> contingencies;
}
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/sensitivityanalysis/server/dto/SensitivityNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
@Setter
@Schema(description = "Sensitivity relatively to nodes")
public class SensitivityNodes {
List<FilterIdent> monitoredVoltageLevels;
List<EquipmentsContainer> monitoredVoltageLevels;

List<FilterIdent> equipmentsInVoltageRegulation;
List<EquipmentsContainer> equipmentsInVoltageRegulation;

List<FilterIdent> contingencies;
List<EquipmentsContainer> contingencies;
}

6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/sensitivityanalysis/server/dto/SensitivityPST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
@Setter
@Schema(description = "Sensitivity relatively to each PST")
public class SensitivityPST {
List<FilterIdent> monitoredBranches;
List<EquipmentsContainer> monitoredBranches;

SensitivityAnalysisInputData.SensitivityType sensitivityType;

List<FilterIdent> psts;
List<EquipmentsContainer> psts;

List<FilterIdent> contingencies;
List<EquipmentsContainer> contingencies;
}

56 changes: 28 additions & 28 deletions .../gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisInputBuilderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@ public SensitivityAnalysisInputBuilderService(ActionsService actionsService, Fil
this.filterService = filterService;
}

private List<Contingency> goGetContingencies(FilterIdent contingencyListIdent, UUID networkUuid, String variantId, Reporter reporter) {
private List<Contingency> goGetContingencies(EquipmentsContainer contingencyListIdent, UUID networkUuid, String variantId, Reporter reporter) {
try {
return actionsService.getContingencyList(contingencyListIdent.getId(), networkUuid, variantId);
return actionsService.getContingencyList(contingencyListIdent.getContainerId(), networkUuid, variantId);
} catch (Exception ex) {
LOGGER.error("Could not get contingencies from " + contingencyListIdent.getName(), ex);
LOGGER.error("Could not get contingencies from " + contingencyListIdent.getContainerName(), ex);
reporter.report(Report.builder()
.withKey("contingencyTranslationFailure")
.withDefaultMessage("Could not get contingencies from contingencyListIdent ${name} : ${exception}")
.withSeverity(TypedValue.ERROR_SEVERITY)
.withValue("exception", ex.getMessage())
.withValue("name", contingencyListIdent.getName())
.withValue("name", contingencyListIdent.getContainerName())
.build());
return List.of();
}
}

private List<Contingency> buildContingencies(SensitivityAnalysisRunContext context, List<FilterIdent> contingencyListsFilterIdents, Reporter reporter) {
return contingencyListsFilterIdents.stream()
private List<Contingency> buildContingencies(SensitivityAnalysisRunContext context, List<EquipmentsContainer> contingencyListsContainerIdents, Reporter reporter) {
return contingencyListsContainerIdents.stream()
.flatMap(contingencyListIdent -> goGetContingencies(contingencyListIdent, context.getNetworkUuid(), context.getVariantId(), reporter).stream())
.collect(Collectors.toList());
}
Expand Down Expand Up @@ -97,23 +97,23 @@ private double getLoadWeight(Load load, SensitivityAnalysisInputData.Distributio
}
}

private List<IdentifiableAttributes> goGetIdentifiables(FilterIdent filter, UUID networkUuid, String variantId, Reporter reporter) {
private List<IdentifiableAttributes> goGetIdentifiables(EquipmentsContainer filter, UUID networkUuid, String variantId, Reporter reporter) {
try {
return filterService.getIdentifiablesFromFilter(filter.getId(), networkUuid, variantId);
return filterService.getIdentifiablesFromFilter(filter.getContainerId(), networkUuid, variantId);
} catch (Exception ex) {
LOGGER.error("Could not get identifiables from filter " + filter.getName(), ex);
LOGGER.error("Could not get identifiables from filter " + filter.getContainerName(), ex);
reporter.report(Report.builder()
.withKey("filterTranslationFailure")
.withDefaultMessage("Could not get identifiables from filter ${name} : ${exception}")
.withSeverity(TypedValue.ERROR_SEVERITY)
.withValue("exception", ex.getMessage())
.withValue("name", filter.getName())
.withValue("name", filter.getContainerName())
.build());
return List.of();
}
}

private Stream<IdentifiableAttributes> getIdentifiablesFromFilter(SensitivityAnalysisRunContext context, FilterIdent filter,
private Stream<IdentifiableAttributes> getIdentifiablesFromContainer(SensitivityAnalysisRunContext context, EquipmentsContainer filter,
List<IdentifiableType> equipmentsTypesAllowed, Reporter reporter) {

List<IdentifiableAttributes> listIdentAttributes = goGetIdentifiables(filter, context.getNetworkUuid(), context.getVariantId(), reporter);
Expand All @@ -123,7 +123,7 @@ private Stream<IdentifiableAttributes> getIdentifiablesFromFilter(SensitivityAna
reporter.report(Report.builder()
.withKey("badEquipmentType")
.withDefaultMessage("Equipments type in filter with name=${name} should be ${expectedType} : filter is ignored")
.withValue("name", filter.getName())
.withValue("name", filter.getContainerName())
.withValue(EXPECTED_TYPE, equipmentsTypesAllowed.toString())
.withSeverity(TypedValue.WARN_SEVERITY)
.build());
Expand All @@ -133,7 +133,7 @@ private Stream<IdentifiableAttributes> getIdentifiablesFromFilter(SensitivityAna
return listIdentAttributes.stream();
}

private Stream<IdentifiableAttributes> getMonitoredIdentifiablesFromFilter(SensitivityAnalysisRunContext context, Network network, FilterIdent filter, List<IdentifiableType> equipmentsTypesAllowed, Reporter reporter) {
private Stream<IdentifiableAttributes> getMonitoredIdentifiablesFromContainer(SensitivityAnalysisRunContext context, Network network, EquipmentsContainer filter, List<IdentifiableType> equipmentsTypesAllowed, Reporter reporter) {

List<IdentifiableAttributes> listIdentAttributes = goGetIdentifiables(filter, context.getNetworkUuid(), context.getVariantId(), reporter);

Expand All @@ -142,7 +142,7 @@ private Stream<IdentifiableAttributes> getMonitoredIdentifiablesFromFilter(Sensi
reporter.report(Report.builder()
.withKey("badMonitoredEquipmentType")
.withDefaultMessage("Monitored equipments type in filter with name=${name} should be ${expectedType} : filter is ignored")
.withValue("name", filter.getName())
.withValue("name", filter.getContainerName())
.withValue(EXPECTED_TYPE, equipmentsTypesAllowed.toString())
.withSeverity(TypedValue.WARN_SEVERITY)
.build());
Expand Down Expand Up @@ -199,19 +199,19 @@ private List<SensitivityFactor> getSensitivityFactorsFromEquipments(List<String>

private List<SensitivityVariableSet> buildSensitivityVariableSets(SensitivityAnalysisRunContext context, Network network, Reporter reporter,
List<IdentifiableType> variablesTypesAllowed,
List<FilterIdent> filters,
List<EquipmentsContainer> filters,
SensitivityAnalysisInputData.DistributionType distributionType) {
List<SensitivityVariableSet> result = new ArrayList<>();

Stream<Pair<String, List<IdentifiableAttributes>>> variablesFiltersLists = filters.stream()
.map(filter -> Pair.of(filter.getName(), getIdentifiablesFromFilter(context, filter, variablesTypesAllowed, reporter).collect(Collectors.toList())))
Stream<Pair<String, List<IdentifiableAttributes>>> variablesContainersLists = filters.stream()
.map(filter -> Pair.of(filter.getContainerName(), getIdentifiablesFromContainer(context, filter, variablesTypesAllowed, reporter).collect(Collectors.toList())))
.filter(list -> !list.getRight().isEmpty());

variablesFiltersLists.forEach(variablesList -> {
variablesContainersLists.forEach(variablesList -> {
List<WeightedSensitivityVariable> variables = new ArrayList<>();
if (variablesList.getRight().get(0).getType() == IdentifiableType.LOAD && distributionType == SensitivityAnalysisInputData.DistributionType.PROPORTIONAL_MAXP) {
reporter.report(Report.builder()
.withKey("distributionTypeNotAllowedForLoadsFilter")
.withKey("distributionTypeNotAllowedForLoadsContainer")
.withDefaultMessage("Distribution type ${distributionType} is not allowed for loads filter : filter is ignored")
.withValue("distributionType", distributionType.name())
.withSeverity(TypedValue.WARN_SEVERITY)
Expand All @@ -220,7 +220,7 @@ private List<SensitivityVariableSet> buildSensitivityVariableSets(SensitivityAna
}
if (variablesList.getRight().get(0).getDistributionKey() == null && distributionType == SensitivityAnalysisInputData.DistributionType.VENTILATION) {
reporter.report(Report.builder()
.withKey("distributionTypeAllowedOnlyForManualFilter")
.withKey("distributionTypeAllowedOnlyForManualContainer")
.withDefaultMessage("Distribution type ${distributionType} is allowed only for manual filter : filter is ignored")
.withValue("distributionType", distributionType.name())
.withSeverity(TypedValue.WARN_SEVERITY)
Expand Down Expand Up @@ -259,7 +259,7 @@ private List<SensitivityVariableSet> buildSensitivityVariableSets(SensitivityAna

private List<SensitivityFactor> buildSensitivityFactorsFromVariablesSets(SensitivityAnalysisRunContext context, Network network, Reporter reporter,
List<IdentifiableType> monitoredEquipmentsTypesAllowed,
List<FilterIdent> monitoredEquipmentsFilters,
List<EquipmentsContainer> monitoredEquipmentsContainers,
List<SensitivityVariableSet> variablesSets,
List<Contingency> contingencies,
SensitivityFunctionType sensitivityFunctionType,
Expand All @@ -268,8 +268,8 @@ private List<SensitivityFactor> buildSensitivityFactorsFromVariablesSets(Sensiti
return List.of();
}

List<IdentifiableAttributes> monitoredEquipments = monitoredEquipmentsFilters.stream()
.flatMap(filter -> getMonitoredIdentifiablesFromFilter(context, network, filter, monitoredEquipmentsTypesAllowed, reporter))
List<IdentifiableAttributes> monitoredEquipments = monitoredEquipmentsContainers.stream()
.flatMap(filter -> getMonitoredIdentifiablesFromContainer(context, network, filter, monitoredEquipmentsTypesAllowed, reporter))
.collect(Collectors.toList());

return getSensitivityFactorsFromEquipments(variablesSets.stream().map(SensitivityVariableSet::getId).collect(Collectors.toList()),
Expand All @@ -278,22 +278,22 @@ private List<SensitivityFactor> buildSensitivityFactorsFromVariablesSets(Sensiti

private List<SensitivityFactor> buildSensitivityFactorsFromEquipments(SensitivityAnalysisRunContext context, Network network, Reporter reporter,
List<IdentifiableType> monitoredEquipmentsTypesAllowed,
List<FilterIdent> monitoredEquipmentsFilters,
List<EquipmentsContainer> monitoredEquipmentsContainers,
List<IdentifiableType> equipmentsTypesAllowed,
List<FilterIdent> filters,
List<EquipmentsContainer> filters,
List<Contingency> contingencies,
SensitivityFunctionType sensitivityFunctionType,
SensitivityVariableType sensitivityVariableType) {
List<IdentifiableAttributes> equipments = filters.stream()
.flatMap(filter -> getIdentifiablesFromFilter(context, filter, equipmentsTypesAllowed, reporter))
.flatMap(filter -> getIdentifiablesFromContainer(context, filter, equipmentsTypesAllowed, reporter))
.collect(Collectors.toList());

if (equipments.isEmpty()) {
return List.of();
}

List<IdentifiableAttributes> monitoredEquipments = monitoredEquipmentsFilters.stream()
.flatMap(filter -> getMonitoredIdentifiablesFromFilter(context, network, filter, monitoredEquipmentsTypesAllowed, reporter))
List<IdentifiableAttributes> monitoredEquipments = monitoredEquipmentsContainers.stream()
.flatMap(filter -> getMonitoredIdentifiablesFromContainer(context, network, filter, monitoredEquipmentsTypesAllowed, reporter))
.collect(Collectors.toList());

return getSensitivityFactorsFromEquipments(equipments.stream().map(IdentifiableAttributes::getId).collect(Collectors.toList()),
Expand Down
Loading
Loading