Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / plugins / battery.cpp

diff --git a/src/plugins/battery.cpp b/src/plugins/battery.cpp
index 262809584d2d4ed1637b48eeaab6cc9c7d19b807..65077e921a5ac3cc380fdace9cd02d704adc2a1c 100644 (file)
--- a/src/plugins/battery.cpp
+++ b/src/plugins/battery.cpp
@@ -166,8 +166,8 @@ public:
   bool is_active() const;
   double get_power();
   double get_state_of_charge();
-  double get_state_of_charge_min();
-  double get_state_of_charge_max();
+  double get_state_of_charge_min() const;
+  double get_state_of_charge_max() const;
   double get_state_of_health();
   double get_capacity();
   double get_cumulative_cost();
@@ -195,7 +195,7 @@ void Battery::set_power(const double p)
     if (power_w_ > 0) {
       soc_shutdown = capacity_wh_ * 3600 * (state_of_charge_ - state_of_charge_min_) / (power_w_ * charge_efficiency_);
       soh_shutdown = (energy_budget_j_ - energy_exchanged_j_) / (power_w_ * charge_efficiency_);
-    } else if (power_w_ < 0) {
+    } else { // power_w_ < 0
       soc_shutdown =
           capacity_wh_ * 3600 * (state_of_charge_max_ - state_of_charge_) / (abs(power_w_) / discharge_efficiency_);
       soh_shutdown = (energy_budget_j_ - energy_exchanged_j_) / (abs(power_w_) / discharge_efficiency_);
@@ -321,12 +321,12 @@ double Battery::get_state_of_charge()
   return state_of_charge_;
 }
 
-double Battery::get_state_of_charge_min()
+double Battery::get_state_of_charge_min() const
 {
   return state_of_charge_min_;
 }
 
-double Battery::get_state_of_charge_max()
+double Battery::get_state_of_charge_max() const
 {
   return state_of_charge_max_;
 }