X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7118dec5b48156de26672adc4edefd129463718..f973433226af2e2e3059b62578bb0f3b215380fb:/examples/cpp/battery-energy/s4u-battery-energy.tesh

diff --git a/examples/cpp/battery-energy/s4u-battery-energy.tesh b/examples/cpp/battery-energy/s4u-battery-energy.tesh
index e0ecf5533a..ee9b4a72c9 100644
--- a/examples/cpp/battery-energy/s4u-battery-energy.tesh
+++ b/examples/cpp/battery-energy/s4u-battery-energy.tesh
@@ -1,15 +1,14 @@
 #!/usr/bin/env tesh
 
-$ ${bindir:=.}/s4u-battery-energy ${platfdir}/battery_platform.xml
-> [host1:manager:(1) 0.000000] [battery_energy/INFO] Initial Battery: SoC: 0.800000 SoH: 1.000000 Capacity (Total): 10.000000Wh Capacity (Usable): 6.000000Wh P: 0.000000W
-> [host1:manager:(1) 0.000000] [battery_energy/INFO] Battery power set to: 200.000000W (host1) + 170.000000W (host2)
-> [host1:manager:(1) 0.000000] [battery_energy/INFO] The battery will be depleted at: 58.378378
-> [host1:manager:(1) 0.000000] [battery_energy/INFO] Exec1 will be finished in: 100.000000
-> [host1:manager:(1) 0.000000] [battery_energy/INFO] Exec2 will be finished in: 200.000000
-> [host1:manager:(1) 58.378378] [battery_energy/INFO] Battery depleted: SoC: 0.200000 SoH: 0.995833 P: 0.000000W
-> [host1:manager:(1) 58.378378] [battery_energy/INFO] Pursuing with power from the grid until both execs are finished
-> [host1:manager:(1) 200.000000] [battery_energy/INFO] Energy consumed: Battery: 21600.000000J (6.000000Wh) Grid: 42400.000000J (11.777778Wh)
-> [200.000000] [host_energy/INFO] Total energy consumption: 64000.000000 Joules (used hosts: 64000.000000 Joules; unused/idle hosts: 0.000000)
-> [200.000000] [host_energy/INFO] Energy consumption of host battery: 0.000000 Joules
-> [200.000000] [host_energy/INFO] Energy consumption of host host1: 30000.000000 Joules
-> [200.000000] [host_energy/INFO] Energy consumption of host host2: 34000.000000 Joules
+$ ${bindir:=.}/s4u-battery-energy ${platfdir}/energy_platform.xml
+> [MyHost1:manager:(1) 0.000000] [battery_energy/INFO] Battery state: SoC: 0.800000 SoH: 1.000000 Energy stored: 28800.000000J Energy provided: 0.000000J Energy consumed 0.000000J
+> [MyHost1:manager:(1) 0.000000] [battery_energy/INFO] Connecting hosts MyHost1 and MyHost2 to the battery
+> [MyHost1:manager:(1) 0.000000] [battery_energy/INFO] Host MyHost1 will now execute 1000000000.000000 flops
+> [93.709721] [battery_energy/INFO] Handler -> Battery low: SoC: 0.200000 SoH: 0.999700 Energy stored: 7197.839784J Energy provided: 19441.944194J Energy consumed 0.000000J
+> [93.709721] [battery_energy/INFO] Disconnecting hosts MyHost1 and MyHost2
+> [93.709721] [battery_energy/INFO] Energy consumed this far by: MyHost1: 9370.972097J, MyHost2: 10370.972097J, MyHost3: 9370.972097J
+> [MyHost1:manager:(1) 200.000000] [battery_energy/INFO] Battery state: SoC: 0.200000 SoH: 0.999700 Energy stored: 7197.839784J Energy provided: 19441.944194J Energy consumed 0.000000J
+> [200.000000] [host_energy/INFO] Total energy consumption: 61000.000000 Joules (used hosts: 21000.000000 Joules; unused/idle hosts: 40000.000000)
+> [200.000000] [host_energy/INFO] Energy consumption of host MyHost1: 20000.000000 Joules
+> [200.000000] [host_energy/INFO] Energy consumption of host MyHost2: 21000.000000 Joules
+> [200.000000] [host_energy/INFO] Energy consumption of host MyHost3: 20000.000000 Joules