X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce354758f86f0fad1ea536f1cbc0a337267b9987..b1786c6251bb5352905bb1d0babb8267307a4b07:/examples/cpp/battery-degradation/s4u-battery-degradation.cpp

diff --git a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
index 0aad5a1e56..13b149ef46 100644
--- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
+++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
@@ -5,20 +5,36 @@
 
 #include "simgrid/plugins/battery.hpp"
 #include "simgrid/s4u.hpp"
+#include <memory>
+#include <simgrid/s4u/Actor.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(battery_degradation, "Messages specific for this s4u example");
 
 static void manager()
 {
-  auto battery = simgrid::s4u::this_actor::get_host();
-  double power = 100;
-  while (sg_battery_get_state_of_health(battery) > 0) {
-    XBT_INFO("%f,%f,SoC", simgrid::s4u::Engine::get_clock(), sg_battery_get_state_of_charge(battery));
-    XBT_INFO("%f,%f,SoH", simgrid::s4u::Engine::get_clock(), sg_battery_get_state_of_health(battery));
-    sg_battery_set_power(battery, power);
-    simgrid::s4u::this_actor::sleep_until(sg_battery_get_next_event_date(battery));
-    power *= -1;
-  }
+  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, -200, 200, 0.9, 0.9, 10, 100);
+
+  battery->set_load("load", 100.0);
+
+  auto handler1 = battery->schedule_handler(
+      0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [battery]() {
+        XBT_INFO("%f,%f,SoC", simgrid::s4u::Engine::get_clock(), battery->get_state_of_charge());
+        XBT_INFO("%f,%f,SoH", simgrid::s4u::Engine::get_clock(), battery->get_state_of_health());
+        battery->set_load("load", -100.0);
+      });
+
+  std::shared_ptr<simgrid::plugins::Battery::Handler> handler2;
+  handler2 = battery->schedule_handler(
+      0.8, simgrid::plugins::Battery::CHARGE, simgrid::plugins::Battery::Handler::PERSISTANT,
+      [battery, handler1, handler2]() {
+        XBT_INFO("%f,%f,SoC", simgrid::s4u::Engine::get_clock(), battery->get_state_of_charge());
+        XBT_INFO("%f,%f,SoH", simgrid::s4u::Engine::get_clock(), battery->get_state_of_health());
+        if (battery->get_state_of_health() < 0.1) {
+          battery->delete_handler(handler1);
+          battery->delete_handler(handler2);
+        }
+        battery->set_load("load", 100.0);
+      });
 }
 
 int main(int argc, char* argv[])
@@ -26,9 +42,8 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  sg_battery_plugin_init();
+  simgrid::s4u::Actor::create("manager", e.host_by_name("MyHost1"), manager);
 
-  simgrid::s4u::Actor::create("manager", e.get_all_hosts()[0], manager);
   e.run();
   return 0;
 }