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

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

diff --git a/src/plugins/photovoltaic.cpp b/src/plugins/photovoltaic.cpp
index 923153b..9d8a717 100644 (file)
--- a/src/plugins/photovoltaic.cpp
+++ b/src/plugins/photovoltaic.cpp
@@ -218,9 +218,9 @@ void Photovoltaic::update()
     if (now <= last_updated_)
       return;
     double power_w = conversion_efficiency_ * area_m2_ * solar_irradiance_w_per_m2_;
-    if (min_power_w_ > 0 and power_w_ < min_power_w_)
+    if (min_power_w_ > 0 && power_w_ < min_power_w_)
       power_w = 0;
-    if (max_power_w_ > 0 and power_w_ > max_power_w_)
+    if (max_power_w_ > 0 && power_w_ > max_power_w_)
       power_w = max_power_w_;
     power_w_ = power_w;
     if (eval_cost_) {
@@ -288,4 +288,4 @@ double sg_photovoltaic_get_power(const_sg_host_t host)
 {
   ensure_plugin_inited();
   return host->extension<Photovoltaic>()->get_power();
-}
\ No newline at end of file
+}