Get RHS from equation (#673)

Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@gmail.com>
powsybl · Dec 17, 2022 · f600a3b · f600a3b
1 parent 54614bc
commit f600a3b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/com/powsybl/openloadflow/ac/outerloop/AcTargetVector.java b/src/main/java/com/powsybl/openloadflow/ac/outerloop/AcTargetVector.java
@@ -11,7 +11,6 @@
 import com.powsybl.openloadflow.ac.equations.AcVariableType;
 import com.powsybl.openloadflow.equations.Equation;
 import com.powsybl.openloadflow.equations.EquationSystem;
-import com.powsybl.openloadflow.equations.EquationTerm;
 import com.powsybl.openloadflow.equations.TargetVector;
 import com.powsybl.openloadflow.network.*;
 
@@ -129,11 +128,7 @@ public static void init(Equation<AcVariableType, AcEquationType> equation, LfNet
                 throw new IllegalStateException("Unknown state variable type: " + equation.getType());
         }
 
-        for (EquationTerm<AcVariableType, AcEquationType> term : equation.getTerms()) {
-            if (term.isActive() && term.hasRhs()) {
-                targets[equation.getColumn()] -= term.rhs();
-            }
-        }
+        targets[equation.getColumn()] -= equation.rhs();
     }
 
     public AcTargetVector(LfNetwork network, EquationSystem<AcVariableType, AcEquationType> equationSystem) {

diff --git a/src/main/java/com/powsybl/openloadflow/dc/DcTargetVector.java b/src/main/java/com/powsybl/openloadflow/dc/DcTargetVector.java
@@ -11,9 +11,9 @@
 import com.powsybl.openloadflow.dc.equations.DcVariableType;
 import com.powsybl.openloadflow.equations.Equation;
 import com.powsybl.openloadflow.equations.EquationSystem;
-import com.powsybl.openloadflow.equations.EquationTerm;
 import com.powsybl.openloadflow.equations.TargetVector;
-import com.powsybl.openloadflow.network.*;
+import com.powsybl.openloadflow.network.LfBranch;
+import com.powsybl.openloadflow.network.LfNetwork;
 
 /**
  * @author Jean-Luc Bouchot (Artelys) <jlbouchot at gmail.com>
@@ -43,11 +43,7 @@ public static void init(Equation<DcVariableType, DcEquationType> equation, LfNet
                 throw new IllegalStateException("Unknown state variable type: " + equation.getType());
         }
 
-        for (EquationTerm<DcVariableType, DcEquationType> term : equation.getTerms()) {
-            if (term.isActive() && term.hasRhs()) {
-                targets[equation.getColumn()] -= term.rhs();
-            }
-        }
+        targets[equation.getColumn()] -= equation.rhs();
     }
 
     public DcTargetVector(LfNetwork network, EquationSystem<DcVariableType, DcEquationType> equationSystem) {

diff --git a/src/main/java/com/powsybl/openloadflow/equations/Equation.java b/src/main/java/com/powsybl/openloadflow/equations/Equation.java
@@ -113,6 +113,16 @@ public double eval() {
         return value;
     }
 
+    public double rhs() {
+        double rhs = 0;
+        for (var term : terms) {
+            if (term.isActive() && term.hasRhs()) {
+                rhs += term.rhs();
+            }
+        }
+        return rhs;
+    }
+
     @Override
     public int hashCode() {
         return elementNum + type.hashCode();