Add ECOFEN

1 files changed, 11 insertions, 6 deletions

diff --git a/ns3-simulator/main.cc b/ns3-simulator/main.cc
index 0e21632..0e4e0f9 100644
--- a/ns3-simulator/main.cc
+++ b/ns3-simulator/main.cc
@@ -12,23 +12,28 @@ int main(int argc, char* argv[]){
   uint32_t sensorsPktSize=150;
   uint32_t sensorsNumber=2;
   uint32_t nbHop=5;
+  uint32_t linksBandwidth=5;
+  uint32_t linksLatency=2;
 
   CommandLine cmd;
-  cmd.AddValue ("sensorsSendInterval", "Number of temperature measurement per second", sensorsFrequency);
-  cmd.AddValue ("sensorsPktSize", "Sensor measurements packet size (bytes)", sensorsPktSize);
-  cmd.AddValue ("sensorsNumber", "Number of sensors", sensorsNumber);
-  cmd.AddValue ("nbHop", "Number of hop between AP and Cloud sensors", sensorsNumber);
+  cmd.AddValue ("sensorsSendInterval", "Number of sensors measurement per second", sensorsFrequency);
+  cmd.AddValue ("sensorsPktSize", "Sensors packet size (bytes)", sensorsPktSize);
+  cmd.AddValue ("sensorsNumber", "Number of sensors connected to AP", sensorsNumber);
+  cmd.AddValue ("nbHop", "Number of hop between AP and Cloud", sensorsNumber);
+  cmd.AddValue ("linksBandwidth", "Links bandwidth between AP and Cloud", linksBandwidth);
+  cmd.AddValue ("linksLatency", "Links latency between AP and Cloud", linksLatency);
   cmd.Parse (argc, argv);
 
   //LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
   //LogComponentEnable("PacketSink", LOG_LEVEL_INFO);
 
   // ---------- Setup Simulations ----------
-  CloudInfos cloud=createCloud(nbHop,5,2); // Create cloud P2P node chain o--o--o--o--o
+  CloudInfos cloud=createCloud(nbHop,linksBandwidth,linksLatency); // Create cloud P2P node chain o--o--o--o--o
+  setupCloudEnergy(cloud); // DO IT JUST AFTER createCloud !!!!! Otherwise you will be in trouble
   Cell cell=createCell(sensorsNumber,cloud.first.Get(0)); // Use first cloud node as Access Point
   setupScenario(cell,cloud,sensorsPktSize,sensorsFrequency); // Send data from Sensors to Cloud
   setupCellEnergy(cell);
-
+  
   // Don't forget the following
   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();