single base_current_

Signed-off-by: petersalemink95 <peter.salemink95@gmail.com>
PowerGridModel · Jan 8, 2025 · f30dd34 · f30dd34
1 parent 3691a73
commit f30dd34
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp
@@ -74,8 +74,9 @@ template <symmetry_tag current_sensor_symmetry_> class CurrentSensor : public Ge
     explicit CurrentSensor(CurrentSensorInput<current_sensor_symmetry> const& current_sensor_input, double u_rated)
         : GenericCurrentSensor{current_sensor_input},
           i_angle_measured_{current_sensor_input.i_angle_measured},
-          i_angle_sigma_{current_sensor_input.i_angle_sigma} {
-        set_current(current_sensor_input, u_rated);
+          i_angle_sigma_{current_sensor_input.i_angle_sigma},
+          base_current_{base_power_3p * inv_sqrt3 / u_rated} {
+        set_current(current_sensor_input);
 
         switch (current_sensor_input.measured_terminal_type) {
         case MeasuredTerminalType::branch_from:
@@ -89,12 +90,11 @@ template <symmetry_tag current_sensor_symmetry_> class CurrentSensor : public Ge
         }
     };
 
-    UpdateChange update(CurrentSensorUpdate<current_sensor_symmetry> const& update_data, double const& u_rated) {
-        double const base_current = base_power_3p * inv_sqrt3 / u_rated;
-        double const scalar = 1.0 / base_current;
+    UpdateChange update(CurrentSensorUpdate<current_sensor_symmetry> const& update_data) {
+        double const scalar = 1.0 / base_current_;
 
         if (!is_nan(update_data.i_sigma)) {
-            i_sigma_ = update_data.i_sigma / base_current;
+            i_sigma_ = update_data.i_sigma / base_current_;
         }
         if (!is_nan(update_data.i_angle_sigma)) {
             i_angle_sigma_ = update_data.i_angle_sigma;
@@ -104,15 +104,13 @@ template <symmetry_tag current_sensor_symmetry_> class CurrentSensor : public Ge
         return {false, false};
     }
 
-    CurrentSensorUpdate<current_sensor_symmetry> inverse(CurrentSensorUpdate<current_sensor_symmetry> update_data,
-                                                         double const& u_rated) const {
+    CurrentSensorUpdate<current_sensor_symmetry>
+    inverse(CurrentSensorUpdate<current_sensor_symmetry> update_data) const {
         assert(update_data.id == this->id() || is_nan(update_data.id));
 
-        double const base_current = base_power_3p * inv_sqrt3 / u_rated;
-
-        set_if_not_nan(update_data.i_sigma, i_sigma_ * base_current);
+        set_if_not_nan(update_data.i_sigma, i_sigma_ * base_current_);
         set_if_not_nan(update_data.i_angle_sigma, i_angle_sigma_);
-        set_if_not_nan(update_data.i_measured, i_measured_ * base_current);
+        set_if_not_nan(update_data.i_measured, i_measured_ * base_current_);
         set_if_not_nan(update_data.i_angle_measured, i_angle_measured_);
 
         return update_data;
@@ -123,12 +121,11 @@ template <symmetry_tag current_sensor_symmetry_> class CurrentSensor : public Ge
     RealValue<current_sensor_symmetry> i_angle_measured_{};
     double i_sigma_{};
     double i_angle_sigma_{};
+    double base_current_{};
 
-    void set_current(CurrentSensorInput<current_sensor_symmetry> const& input, double const& u_rated) {
-        double const base_current = base_power_3p * inv_sqrt3 / u_rated;
-        double const scalar = 1.0 / base_current;
-        i_sigma_ = input.i_sigma / base_current;
-        i_measured_ = input.i_measured * scalar;
+    void set_current(CurrentSensorInput<current_sensor_symmetry> const& input) {
+        i_sigma_ = input.i_sigma / base_current_;
+        i_measured_ = input.i_measured / base_current_;
     }
 
     // TODO when filling the functions below take in mind that i_angle_sigma is optional

diff --git a/tests/cpp_unit_tests/test_current_sensor.cpp b/tests/cpp_unit_tests/test_current_sensor.cpp
@@ -148,7 +148,7 @@ TEST_CASE("Test current sensor") {
             expected.i_angle_measured = i_angle_measured;
         }
 
-        auto const inv = current_sensor.inverse(cs_update, u_rated);
+        auto const inv = current_sensor.inverse(cs_update);
 
         CHECK(inv.id == expected.id);
         check_nan_preserving_equality(inv.i_sigma, expected.i_sigma);
@@ -223,7 +223,7 @@ TEST_CASE("Test current sensor") {
                                                           i_sigma, i_angle_sigma, i_measured, i_angle_measured},
                                                          u_rated};
 
-        auto const inv = current_sensor.inverse(cs_update, u_rated);
+        auto const inv = current_sensor.inverse(cs_update);
 
         CHECK(inv.id == expected.id);
         check_nan_preserving_equality(inv.i_sigma, expected.i_sigma);