Merge branch 'example-battery-chiller-solar' into 'master'

add battery-chiller-solar example.

See merge request simgrid/simgrid!174

diff --combined MANIFEST.in
index 610932b,422f0e4..2c3927c
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -166,6 -166,10 +166,10 @@@ include examples/cpp/app-masterworkers/
  include examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml
  include examples/cpp/app-token-ring/s4u-app-token-ring.cpp
  include examples/cpp/app-token-ring/s4u-app-token-ring.tesh
+ include examples/cpp/battery-chiller-solar/s4u-battery-chiller-solar.cpp
+ include examples/cpp/battery-chiller-solar/s4u-battery-chiller-solar.tesh
+ include examples/cpp/battery-connector/s4u-battery-connector.cpp
+ include examples/cpp/battery-connector/s4u-battery-connector.tesh
  include examples/cpp/battery-degradation/plot_battery_degradation.py
  include examples/cpp/battery-degradation/s4u-battery-degradation.cpp
  include examples/cpp/battery-degradation/s4u-battery-degradation.tesh
@@@ -348,6 -352,8 +352,6 @@@ include examples/cpp/network-ns3/s4u-ne
  include examples/cpp/network-ns3/s4u-network-ns3.cpp
  include examples/cpp/network-wifi/s4u-network-wifi.cpp
  include examples/cpp/network-wifi/s4u-network-wifi.tesh
 -include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.cpp
 -include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.tesh
  include examples/cpp/platform-comm-serialize/s4u-platform-comm-serialize.cpp
  include examples/cpp/platform-comm-serialize/s4u-platform-comm-serialize.tesh
  include examples/cpp/platform-failures/s4u-platform-failures.cpp
@@@ -378,8 -384,6 +382,8 @@@ include examples/cpp/replay-io/s4u-repl
  include examples/cpp/replay-io/s4u-replay-io_d.xml
  include examples/cpp/routing-get-clusters/s4u-routing-get-clusters.cpp
  include examples/cpp/routing-get-clusters/s4u-routing-get-clusters.tesh
 +include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.cpp
 +include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.tesh
  include examples/cpp/synchro-barrier/s4u-mc-synchro-barrier.tesh
  include examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp
  include examples/cpp/synchro-barrier/s4u-synchro-barrier.tesh
@@@ -394,8 -398,6 +398,8 @@@ include examples/cpp/synchro-mutex/s4u-
  include examples/cpp/synchro-semaphore/s4u-mc-synchro-semaphore.tesh
  include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
  include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh
 +include examples/cpp/task-dispatch/s4u-task-dispatch.cpp
 +include examples/cpp/task-dispatch/s4u-task-dispatch.tesh
  include examples/cpp/task-io/s4u-task-io.cpp
  include examples/cpp/task-io/s4u-task-io.tesh
  include examples/cpp/task-microservice/s4u-task-microservice.cpp
@@@ -643,12 -645,9 +647,12 @@@ include examples/smpi/trace_call_locati
  include examples/smpi/trace_call_location/trace_call_location.tesh
  include examples/smpi/trace_simple/trace_simple.c
  include examples/smpi/trace_simple/trace_simple.tesh
 +include examples/sthread/pthread-mc-mutex-recursive.tesh
  include examples/sthread/pthread-mc-mutex-simple.tesh
  include examples/sthread/pthread-mc-mutex-simpledeadlock.tesh
  include examples/sthread/pthread-mc-producer-consumer.tesh
 +include examples/sthread/pthread-mutex-recursive.c
 +include examples/sthread/pthread-mutex-recursive.tesh
  include examples/sthread/pthread-mutex-simple.c
  include examples/sthread/pthread-mutex-simple.tesh
  include examples/sthread/pthread-mutex-simpledeadlock.c

diff --combined examples/cpp/CMakeLists.txt
index b917540,a0fc73f..6f1af7f
--- 1/examples/cpp/CMakeLists.txt
--- 2/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -157,7 -157,7 +157,7 @@@ foreach (example activityset-testany ac
                   actor-create actor-daemon actor-exiting actor-join actor-kill
                   actor-lifetime actor-migrate actor-suspend actor-yield actor-stacksize
                   app-bittorrent app-chainsend app-token-ring
-                  battery-degradation battery-simple battery-energy
+                  battery-chiller-solar battery-connector battery-degradation battery-simple battery-energy
                   chiller-simple
                   comm-pingpong comm-ready comm-suspend comm-wait comm-waituntil
                   comm-dependent comm-host2host comm-failure comm-throttling
@@@ -172,7 -172,7 +172,7 @@@
                   mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
                   network-ns3 network-ns3-wifi network-wifi
                   io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent
 -                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load 
 +                 task-dispatch task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load
                   solar-panel-simple
                   platform-comm-serialize platform-failures platform-profile platform-properties
                   plugin-host-load plugin-jbod plugin-link-load plugin-prodcons