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

Jump to bottom

Non evacuated energy computation #51

Merged
merged 24 commits into from
Jan 12, 2024
Merged

Non evacuated energy computation #51

merged 24 commits into from
Jan 12, 2024

Conversation

FranckLecuyer
Copy link
Collaborator

No description provided.

@FranckLecuyer FranckLecuyer changed the title Non evacuated energy computation [WIP] Non evacuated energy computation Dec 1, 2023
@FranckLecuyer
Handle provider and default provider for non evacuated energy
2e0cc05 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Merge remote-tracking branch 'origin/main' into non-evacuated-energy-…
351e078 
…computation

Signed-off-by: Franck LECUYER <[email protected]>

# Conflicts:
#	src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisWorkerService.java
@FranckLecuyer
Non evacuated energy computation logs are now displayed in the result…
cbfb207 
…s (like for other computation types)

Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer FranckLecuyer changed the title [WIP] Non evacuated energy computation Non evacuated energy computation Dec 8, 2023
@TheMaskedTurtle TheMaskedTurtle self-requested a review December 13, 2023 13:51
@FranckLecuyer
Fix check on limits existence (permanent and temporary limit)
ec09471 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Merge remote-tracking branch 'origin/main' into non-evacuated-energy-…
c590f6f 
…computation

Signed-off-by: Franck LECUYER <[email protected]>

# Conflicts:
#	src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisInputBuilderService.java
@FranckLecuyer
Fix failing test
fc4ee21 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Some fixes and refactoring
5fbfc56 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Merge remote-tracking branch 'origin/main' into non-evacuated-energy-…
a70c795 
…computation

Signed-off-by: Franck LECUYER <[email protected]>

# Conflicts:
#	src/main/java/org/gridsuite/sensitivityanalysis/server/service/NotificationService.java
#	src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisWorkerService.java
@FranckLecuyer
Merge remote-tracking branch 'origin/main' into non-evacuated-energy-…
b15ca22 
…computation

Signed-off-by: Franck LECUYER <[email protected]>

# Conflicts:
#	src/main/java/org/gridsuite/sensitivityanalysis/server/SensitivityAnalysisController.java
#	src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisInputBuilderService.java
antoinebhs
antoinebhs reviewed Jan 4, 2024
View reviewed changes
...g/gridsuite/sensitivityanalysis/server/dto/nonevacuatedenergy/results/StageDetailResult.java Outdated
private Map<EnergySource, Double> pInitByEnergySource = new EnumMap<>(EnergySource.class);

@Builder.Default
private Map<String, ContingencyStageDetailResult> resultsbyContingency = new HashMap<>(); // key is null for N
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"N" instead ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or separate N result and contingency results ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: resultsBy

antoinebhs
antoinebhs reviewed Jan 4, 2024
View reviewed changes
.../gridsuite/sensitivityanalysis/server/dto/nonevacuatedenergy/results/StageSummaryResult.java

private Double percentOverload;

private String contingencyId; // null if N
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"N" if N?

antoinebhs
antoinebhs reviewed Jan 5, 2024
View reviewed changes
...uite/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyRunContext.java
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
@Getter
public class NonEvacuatedEnergyRunContext {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very close to the sensi version, can we have an abstraction?

antoinebhs
antoinebhs reviewed Jan 5, 2024
View reviewed changes
...e/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyResultContext.java
/**
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
public class NonEvacuatedEnergyResultContext {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very close to the sensi version, can we have an abstraction?

antoinebhs
antoinebhs reviewed Jan 5, 2024
View reviewed changes
...e/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyWorkerService.java
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
@Service
public class NonEvacuatedEnergyWorkerService {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some methods can be shared with SensitivityAnalysisWorkerService

antoinebhs
antoinebhs reviewed Jan 8, 2024
View reviewed changes
...e/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyWorkerService.java Outdated
// the limit value multiplied by the input coefficient (nCoeff/nm1Coeff)
if (contingencyIndex < 0) { // N
if (monitoredBranchThreshold.isIstN()) {
limitName = "IST";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add as constant at the top of the file?

antoinebhs
antoinebhs reviewed Jan 8, 2024
View reviewed changes
...e/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyWorkerService.java
// loop until no more remaining or no more generators to dispatch or max iteration reached
while (!finished) {
i++;
int j = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to boolean firstIteration?

antoinebhs
antoinebhs reviewed Jan 8, 2024
View reviewed changes
...e/sensitivityanalysis/server/service/nonevacuatedenergy/NonEvacuatedEnergyWorkerService.java
// the sum of generator variation and generator capping is higher than the generator targetP :
// we update the generator capping with the targetP and remove this generator from the generators to dispatch
// we substract the delta between the generator targetP and the generator capping from the remaining
variationsByEnergySource.put(generator.getEnergySource(), variationsByEnergySource.get(generator.getEnergySource()) + targetP - generatorCappings.get(generatorId).getCapping());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create a variable deltaP for targetP - generatorCappings.get(generatorId).getCapping()?

antoinebhs
antoinebhs reviewed Jan 8, 2024
View reviewed changes
Copy link
Contributor

@antoinebhs antoinebhs left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • To validate this algorithm, a comparative study with CVG and the same input parameters should be done at some point.
  • We should try to lower the number of sonar issues, we should be able to get close to 0 with some method extraction and fixes?

TheMaskedTurtle
TheMaskedTurtle reviewed Jan 9, 2024
View reviewed changes
Copy link
Contributor

@TheMaskedTurtle TheMaskedTurtle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add business logs to understand what's going on in the process, it's hard to debug for now

@FranckLecuyer
Changing endpoints
7ce81d7 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Some changes after code review
8c23a28 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Fix resource test file
0119055 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Refactoring code on smaller methods
83ee023 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Another code refactoring
4a94d84 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Code refactoring
454ed58 
Adding reports

Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Fix report on limit considered for monitored branch
acf0ee4 
Signed-off-by: Franck LECUYER <[email protected]>
@FranckLecuyer
Adding another report
cf9b3c9 
Signed-off-by: Franck LECUYER <[email protected]>
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

21 New issues
0 Security Hotspots
82.1% Coverage on New Code
1.4% Duplication on New Code

See analysis details on SonarCloud

@FranckLecuyer FranckLecuyer merged commit 6ce9863 into main Jan 12, 2024
3 checks passed
@FranckLecuyer FranckLecuyer deleted the non-evacuated-energy-computation branch January 12, 2024 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheMaskedTurtle TheMaskedTurtle TheMaskedTurtle left review comments

@antoinebhs antoinebhs antoinebhs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@FranckLecuyer @TheMaskedTurtle @antoinebhs