Skip to content

Commit

Permalink
Fix javadoc warnings (#1152)
Browse files Browse the repository at this point in the history 
Signed-off-by: Damien Jeandemange <[email protected]>
  • Loading branch information
@jeandemanged
jeandemanged authored Dec 16, 2024
1 parent 868e5e3 commit 78cf08a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 53 deletions.
82 changes: 32 additions & 50 deletions src/main/java/com/powsybl/openloadflow/ac/equations/asym/LoadFortescuePowerEquationTerm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,39 +75,24 @@ public LoadFortescuePowerEquationTerm(LfBus bus, VariableSet<AcVariableType> var
}

public double ph(Fortescue.SequenceType g) {
switch (g) {
case ZERO:
return sv.get(phVarZero.getRow());

case POSITIVE:
return sv.get(phVar.getRow());

case NEGATIVE:
return sv.get(phVarNegative.getRow());

default:
throw new IllegalStateException("Unknown Phi variable at bus: " + element.getId());
}
return switch (g) {
case ZERO -> sv.get(phVarZero.getRow());
case POSITIVE -> sv.get(phVar.getRow());
case NEGATIVE -> sv.get(phVarNegative.getRow());
};
}

public double v(Fortescue.SequenceType g) {
switch (g) {
case ZERO:
return sv.get(vVarZero.getRow());

case POSITIVE:
return sv.get(vVar.getRow());

case NEGATIVE:
return sv.get(vVarNegative.getRow());

default:
throw new IllegalStateException("Unknown V variable at bus: " + element.getId());
}
return switch (g) {
case ZERO -> sv.get(vVarZero.getRow());
case POSITIVE -> sv.get(vVar.getRow());
case NEGATIVE -> sv.get(vVarNegative.getRow());
};
}

/**
* We use the formula with complex matrices:
* <pre>{@literal
*
* [So] [Vo 0 0] [1/Va 0 0] [Sa]
* [Sd] = [0 Vd 0]. 1/3 . [F] . [0 1/Vb 0] . [Sb]
Expand All @@ -116,6 +101,7 @@ public double v(Fortescue.SequenceType g) {
* term (Ifortescue)*
* <------------------------------------------->
* term Sfortescue
* }</pre>
*/
public static double pq(LfBus bus, ComplexPart complexPart, Fortescue.SequenceType sequenceType, double vZero, double phZero, double vPositive, double phPositive, double vNegative, double phNegative) {
LfAsymBus asymBus = bus.getAsym();
Expand Down Expand Up @@ -143,31 +129,29 @@ public static double pq(LfBus bus, ComplexPart complexPart, Fortescue.SequenceTy
DenseMatrix mIfortescueConjugate = Fortescue.createMatrix().times(m0T0);
DenseMatrix mSfortescue = mSquareVFortescue.times(mIfortescueConjugate); // term T0 = Sfortescue

switch (sequenceType) {
case ZERO:
return complexPart == ComplexPart.REAL ? mIfortescueConjugate.get(0, 0) : -mIfortescueConjugate.get(1, 0); // IxZero or IyZero

case POSITIVE:
return complexPart == ComplexPart.REAL ? mSfortescue.get(2, 0) : mSfortescue.get(3, 0); // Ppositive or Qpositive
return switch (sequenceType) {
case ZERO ->
complexPart == ComplexPart.REAL ? mIfortescueConjugate.get(0, 0) : -mIfortescueConjugate.get(1, 0); // IxZero or IyZero

case NEGATIVE:
return complexPart == ComplexPart.REAL ? mIfortescueConjugate.get(4, 0) : -mIfortescueConjugate.get(5, 0); // IxNegative or IyNegative
case POSITIVE ->
complexPart == ComplexPart.REAL ? mSfortescue.get(2, 0) : mSfortescue.get(3, 0); // Ppositive or Qpositive

default:
throw new IllegalStateException("Unknown sequence at bus : " + bus.getId());
}
case NEGATIVE ->
complexPart == ComplexPart.REAL ? mIfortescueConjugate.get(4, 0) : -mIfortescueConjugate.get(5, 0); // IxNegative or IyNegative
};
}

/**
* We derivate the PQ formula with complex matrices:
*
* <pre>{@literal
* [So] [dVo/dx 0 0] [1/Va 0 0] [Sa] [Vo 0 0] [Sa 0 0] [1/Va 0 0] [1/Va 0 0] [dV0/dx]
* d( [Sd] )/dx = 1/3 . [0 dVd/dx 0] . [F] . [0 1/Vb 0] . [Sb] + [0 Vd 0] . [F] .(-1/3). [0 Sb 0] . [0 1/Vb 0] . [0 1/Vb 0] . [F] . [dVd/dx]
* [Si] [0 0 dVi/dx] [0 0 1/Vc] [Sc] [0 0 Vi] [0 0 Sc] [0 0 1/Vc] [0 0 1/Vc] [dVi/dx]
* <--------------------------------------------> <----------------------------------------------------------------------->
* term T1 term (dIfortescue)*
* <----------------------------------------------------------------------------------->
* term T2
* }</pre>
*/
public static double dpq(LfBus bus, ComplexPart complexPart, Fortescue.SequenceType sequenceType, Variable<AcVariableType> derVariable, double vo, double pho, double vd, double phd, double vi, double phi) {
LfAsymBus asymBus = bus.getAsym();
Expand Down Expand Up @@ -243,19 +227,16 @@ public static double dpq(LfBus bus, ComplexPart complexPart, Fortescue.SequenceT
DenseMatrix mdIFortescueConjugate = Fortescue.createMatrix().times(m3T2);
DenseMatrix mT2 = mSquareVFortescue.times(mdIFortescueConjugate);

switch (sequenceType) {
case ZERO:
return complexPart == ComplexPart.REAL ? mdIFortescueConjugate.get(0, 0) : -mdIFortescueConjugate.get(1, 0); // dIxZero or dIyZero
return switch (sequenceType) {
case ZERO ->
complexPart == ComplexPart.REAL ? mdIFortescueConjugate.get(0, 0) : -mdIFortescueConjugate.get(1, 0); // dIxZero or dIyZero

case POSITIVE:
return complexPart == ComplexPart.REAL ? mT1.get(2, 0) + mT2.get(2, 0) : mT1.get(3, 0) + mT2.get(3, 0); // dPpositive or dQpositive
case POSITIVE ->
complexPart == ComplexPart.REAL ? mT1.get(2, 0) + mT2.get(2, 0) : mT1.get(3, 0) + mT2.get(3, 0); // dPpositive or dQpositive

case NEGATIVE:
return complexPart == ComplexPart.REAL ? mdIFortescueConjugate.get(4, 0) : -mdIFortescueConjugate.get(5, 0); // dIxNegative or dIyNegative

default:
throw new IllegalStateException("Unknown sequence at bus : " + bus.getId());
}
case NEGATIVE ->
complexPart == ComplexPart.REAL ? mdIFortescueConjugate.get(4, 0) : -mdIFortescueConjugate.get(5, 0); // dIxNegative or dIyNegative
};
}

@Override
Expand Down Expand Up @@ -312,13 +293,14 @@ public static DenseMatrix createInvVabcSquare(LfBus bus, double vAx, double vAy,
/**
* if this is a vector we build: m = [m1x;m1y;m2x;m2y;m3x;m3y] equivalent in complex to [m1;m2;m3]
* if not, this is a 6x6 square matrix expected:
*
* <pre>
* [m1x -m1y 0 0 0 0 ]
* [m1y m1x 0 0 0 0 ]
* [ 0 0 m2x -m2y 0 0 ] [m1 0 0]
* m = [ 0 0 m2y m2x 0 0 ] equivalent in complex to [ 0 m2 0]
* [ 0 0 0 0 m3x -m3y] [ 0 0 m3]
* [ 0 0 0 0 m3y m3x]
* </pre>
*/
public static DenseMatrix createCartesianMatrix(double m1x, double m1y, double m2x, double m2y, double m3x, double m3y, boolean isVector) {
DenseMatrix mCartesian;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/powsybl/openloadflow/network/DisabledBranchStatus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package com.powsybl.openloadflow.network;

/**
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
* @author Geoffroy Jamgotchian {@literal <geoffroy.jamgotchian at rte-france.com>}
*/
public enum DisabledBranchStatus {
BOTH_SIDES,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/powsybl/openloadflow/network/ReactivePowerControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.Objects;

/**
* @author Pierre Arvy <pierre.arvy at artelys.com>
* @author Pierre Arvy {@literal <pierre.arvy at artelys.com>}
*/
public class ReactivePowerControl extends Control {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/powsybl/openloadflow/network/TransformerReactivePowerControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.Optional;

/**
* @author Pierre Arvy <pierre.arvy at artelys.com>
* @author Pierre Arvy {@literal <pierre.arvy at artelys.com>}
*/
public class TransformerReactivePowerControl extends ReactivePowerControl {

Expand Down

0 comments on commit 78cf08a

Please sign in to comment.