X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f10e58f8e9ede5aa9c325ae2441bd74d5b056597..4af8aca04c6ee72db752866796034d67ca2e900d:/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 13b149ef46..4973587089 100644 --- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp +++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp @@ -10,14 +10,17 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(battery_degradation, "Messages specific for this s4u example"); -static void manager() +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, -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]() { + 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); @@ -26,7 +29,7 @@ static void manager() std::shared_ptr handler2; handler2 = battery->schedule_handler( 0.8, simgrid::plugins::Battery::CHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, - [battery, handler1, handler2]() { + [&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) { @@ -35,14 +38,6 @@ static void manager() } battery->set_load("load", 100.0); }); -} - -int main(int argc, char* argv[]) -{ - simgrid::s4u::Engine e(&argc, argv); - e.load_platform(argv[1]); - - simgrid::s4u::Actor::create("manager", e.host_by_name("MyHost1"), manager); e.run(); return 0;