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.

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

Fix DC equations when a1 is a variable #213

Merged
merged 3 commits into from
Feb 4, 2021
Merged

Fix DC equations when a1 is a variable #213

merged 3 commits into from
Feb 4, 2021

Conversation

geofjamg
Copy link
Member

@geofjamg geofjamg commented Feb 2, 2021

Signed-off-by: Geoffroy Jamgotchian geoffroy.jamgotchian@rte-france.com

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest
No

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Bug fix

What is the current behavior? (You can also link to an open issue here)
When a1 is considered as a variable the rhs, so the part of the equation which has to be moved to right hand side is not correct.

What is the new behavior (if this is a feature change)?
rhs has been fixed

Does this PR introduce a breaking change or deprecate an API? If yes, check the following:

  • The Breaking Change or Deprecated label has been added
  • The migration guide has been updated in the github wiki (What changes might users need to make in their application due to this PR?)

Other information:

(if any of the questions/checkboxes don't apply, please delete them entirely)

Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
@geofjamg geofjamg requested review from Djazouli and annetill February 2, 2021 21:55
Copy link
Contributor

@Djazouli Djazouli left a comment

Choose a reason for hiding this comment

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

I tried it on the data I was having issues with, and it seems to be working, so it sounds good to me !

@@ -58,7 +58,11 @@ public void update(double[] x) {
double ph2 = x[ph2Var.getRow()];
double a1 = a1Var != null ? x[a1Var.getRow()] : branch.getPiModel().getA1();
p1 = calculate(ph1, ph2, a1);
rhs = -power * (A2 - a1);
if (a1Var == null) {
Copy link
Member

Choose a reason for hiding this comment

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

In ac module, you have introduced the notion of active variable. I think that we have to test if (a1Var != null && a1Var.isActive()), as we do in ac module.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
@geofjamg geofjamg requested a review from annetill February 3, 2021 20:06
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 4, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

90.5% 90.5% Coverage
0.0% 0.0% Duplication

@geofjamg geofjamg merged commit 872ac06 into master Feb 4, 2021
@geofjamg geofjamg deleted the fix_a1_rhs branch February 4, 2021 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants