issue PowerGridModel#729 fix problems with windows-compiler

sudo-ac · Sep 26, 2024 · 56b459b · 56b459b
1 parent dbb5050
commit 56b459b
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/genericbranch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/genericbranch.hpp
@@ -43,12 +43,11 @@ class GenericBranch final : public Branch {
           x1_{genericbranch_input.x1},
           g1_{genericbranch_input.g1},
           b1_{genericbranch_input.b1},
-          k_{is_nan(genericbranch_input.k) ? 1.0 : genericbranch_input.k},
-          theta_{is_nan(genericbranch_input.theta) ? 0.0 : fmod(genericbranch_input.theta, 2 * M_PI)},
+          k_{std::isnan(genericbranch_input.k) ? 1.0 : genericbranch_input.k},
+          theta_{std::isnan(genericbranch_input.theta) ? 0.0 : std::fmod(genericbranch_input.theta, 2 * pi)},
           base_i_from_{base_power_3p / u1_rated / sqrt3},
-          base_i_to_{base_power_3p / u2_rated / sqrt3} {
-
-        base_y_ = base_i_to_ / (u2_rated / sqrt3);
+          base_i_to_{base_power_3p / u2_rated / sqrt3},
+          base_y_ {base_i_to_/(u2_rated / sqrt3)}  {
 
         y1_series_ = 1.0 / (r1_ + 1.0i * x1_) / base_y_;
         y1_shunt_ = (g1_ + 1.0i * b1_) / base_y_;
@@ -57,7 +56,7 @@ class GenericBranch final : public Branch {
     // override getter
     double base_i_from() const override { return base_i_from_; }
     double base_i_to() const override { return base_i_to_; }
-    double loading(double max_s, double /*max_i*/) const override { return is_nan(sn_) ? 0.0 : (max_s / sn_); };
+    double loading(double max_s, double /*max_i*/) const override { return std::isnan(sn_) ? 0.0 : (max_s / sn_); };
     double phase_shift() const override { return theta_; }
     bool is_param_mutable() const override { return false; }
 
@@ -91,19 +90,24 @@ class GenericBranch final : public Branch {
 
   private:
     double sn_;
-    double r1_, x1_, g1_, b1_;
+    double r1_;
+    double x1_;
+    double g1_;
+    double b1_;
     double k_;
     double theta_;
-    double base_i_from_, base_i_to_;
-    DoubleComplex y1_series_, y1_shunt_;
-    DoubleComplex yff_, yft_, ytf_, ytt_;
+    double base_i_from_;
+    double base_i_to_;
     double base_y_;
+    DoubleComplex y1_series_;
+    DoubleComplex y1_shunt_;
+
 
     BranchCalcParam<symmetric_t> sym_calc_param() const override {
         return calc_param_y_sym(y1_series_, y1_shunt_, k_ * std::exp(1.0i * theta_));
     }
 
-    BranchCalcParam<asymmetric_t> asym_calc_param() const override { throw NotImplementedError(); }
+    [[noreturn]] BranchCalcParam<asymmetric_t> asym_calc_param() const override { throw NotImplementedError(); }
 };
 
 } // namespace power_grid_model