Complete revamp of battery plugin

[simgrid.git] / 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 3a56ff0..829efef 100644 (file)
--- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
+++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
@@ -5,20 +5,39 @@
 
 #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()
 {
-  const 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, 0.9, 0.9, 10, 100, 0.9);
+
+  battery->set_load("load", 100);
+
+  auto event1 = battery->create_event(
+      0.2, simgrid::plugins::Battery::DISCHARGE,
+      [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]() {
+        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->set_load("load", 100);
+      },
+      true);
 }
 
 int main(int argc, char* argv[])
@@ -26,9 +45,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;
 }