Debug simulator

4 files changed, 11 insertions, 6 deletions

diff --git a/ns3-simulations/ns3-simulator/main.cc b/ns3-simulations/ns3-simulator/main.cc
index 0e4e0f9..7d9338c 100644
--- a/ns3-simulations/ns3-simulator/main.cc
+++ b/ns3-simulations/ns3-simulator/main.cc
@@ -38,6 +38,8 @@ int main(int argc, char* argv[]){
   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
   
   // Run Simulations
+  uint32_t nNode=ns3::NodeList::GetNNodes();
+  NS_LOG_UNCOND("Starting simulation with "<< nNode << " nodes");
   Simulator::Stop (Seconds (20));
   Simulator::Run ();
   Simulator::Destroy ();
diff --git a/ns3-simulations/ns3-simulator/modules/energy.cc b/ns3-simulations/ns3-simulator/modules/energy.cc
index 64d30e1..11f1c7a 100644
--- a/ns3-simulations/ns3-simulator/modules/energy.cc
+++ b/ns3-simulations/ns3-simulator/modules/energy.cc
@@ -22,15 +22,17 @@ void setupCellEnergy(Cell cell){
 
   
   // Trace
-  DeviceEnergyModelContainer energyModels(edgeApDeviceModels, edgeDeviceModels);
-  DeviceEnergyModelContainer::Iterator it=energyModels.Begin();
-
-  int i=0;
-  while(it!=energyModels.End()){
-    (*it)->TraceConnect ("TotalEnergyConsumption", std::to_string(i),MakeCallback (&EnergyUpdated));
+  DeviceEnergyModelContainer::Iterator it=edgeDeviceModels.Begin();
+  int i=1; // Node 0 will be AP, other node will have negative id (cf following while)
+           // This is usefull in logs, in fact ECOFEN nodes will have positive ID and WIFI energy nodes negative id
+           // AP will have id 0 in ECOFEN and WIFI (in order to combine their energy value when parsing logs
+  while(it!=edgeDeviceModels.End()){
+    (*it)->TraceConnect ("TotalEnergyConsumption", std::to_string(0-i),MakeCallback (&EnergyUpdated));
     it++;
     i++;
   }
+  // AP will have id 0
+  (*edgeApDeviceModels.Begin())->TraceConnect ("TotalEnergyConsumption", std::to_string(0),MakeCallback (&EnergyUpdated));
 
  //   Ptr<BasicEnergySource> basicSourcePtr0 = DynamicCast<BasicEnergySource> (wifiEdgeNodesSources.Get (0));
   // //basicSourcePtr0->TraceConnectWithoutContext ("RemainingEnergy", MakeCallback (&RemainingEnergy));
diff --git a/ns3-simulations/ns3-simulator/modules/modules.hpp b/ns3-simulations/ns3-simulator/modules/modules.hpp
index 7945959..c47dc39 100644
--- a/ns3-simulations/ns3-simulator/modules/modules.hpp
+++ b/ns3-simulations/ns3-simulator/modules/modules.hpp
@@ -25,6 +25,7 @@
 #include "ns3/wifi-radio-energy-model-helper.h"
 #include "ns3/point-to-point-helper.h"
 #include "ns3/ecofen-module.h"
+#include "ns3/node-list.h"
 
 // C++ library
 #include <iostream> // Why not ?
diff --git a/ns3-simulations/ns3-simulator/simulator b/ns3-simulations/ns3-simulator/simulator
index adbefed..ecccc15 100755
--- a/ns3-simulations/ns3-simulator/simulator
+++ b/ns3-simulations/ns3-simulator/simulator