replace create_event by schedule_handler and move param callback after repeat. also...

[simgrid.git] / examples / cpp / battery-simple / s4u-battery-simple.cpp

diff --git a/examples/cpp/battery-simple/s4u-battery-simple.cpp b/examples/cpp/battery-simple/s4u-battery-simple.cpp
index a499370..510d33f 100644 (file)
--- a/examples/cpp/battery-simple/s4u-battery-simple.cpp
+++ b/examples/cpp/battery-simple/s4u-battery-simple.cpp
@@ -14,17 +14,20 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, 0.9, 0.9, 10, 1000, 0.9);
+  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, -100, 100, 0.9, 0.9, 10, 1000);
 
   XBT_INFO("Initial state: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
            battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
            battery->get_energy_provided(), battery->get_energy_consumed());
 
-  double load_w = 100;
+  /* This power is beyond the nominal values of the battery
+   * see documentation for more info
+   */
+  double load_w = 150;
   battery->set_load("load", load_w);
   XBT_INFO("Set load to %fW", load_w);
 
-  battery->create_event(0.2, simgrid::plugins::Battery::DISCHARGE, [battery, &load_w]() {
+  battery->schedule_handler(0.2, simgrid::plugins::Battery::DISCHARGE, true, [battery, &load_w]() {
     XBT_INFO("Discharged state: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
              battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
              battery->get_energy_provided(), battery->get_energy_consumed());
@@ -32,7 +35,7 @@ int main(int argc, char* argv[])
     XBT_INFO("Set load to %fW", -load_w);
   });
 
-  battery->create_event(0.8, simgrid::plugins::Battery::CHARGE, [battery]() {
+  battery->schedule_handler(0.8, simgrid::plugins::Battery::CHARGE, true, [battery]() {
     XBT_INFO("Charged state: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
              battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
              battery->get_energy_provided(), battery->get_energy_consumed());