X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6f111b95343b45e14c154574210ef9a448369f5..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 829efeff02..13b149ef46 100644
--- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
+++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
@@ -12,32 +12,29 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(battery_degradation, "Messages specific for this s4
 
 static void manager()
 {
-  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, 0.9, 0.9, 10, 100, 0.9);
+  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, -200, 200, 0.9, 0.9, 10, 100);
 
-  battery->set_load("load", 100);
+  battery->set_load("load", 100.0);
 
-  auto event1 = battery->create_event(
-      0.2, simgrid::plugins::Battery::DISCHARGE,
-      [battery]() {
+  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);
-      },
-      true);
-
-  std::shared_ptr<simgrid::plugins::Battery::Event> event2;
-  event2 = battery->create_event(
-      0.8, simgrid::plugins::Battery::CHARGE,
-      [battery, event1, event2]() {
+        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_event(event1);
-          battery->delete_event(event2);
+          battery->delete_handler(handler1);
+          battery->delete_handler(handler2);
         }
-        battery->set_load("load", 100);
-      },
-      true);
+        battery->set_load("load", 100.0);
+      });
 }
 
 int main(int argc, char* argv[])