Clean repo, update paper

8 files changed, 0 insertions, 501 deletions

diff --git a/ns3-simulations/nix/default.nix b/ns3-simulations/nix/default.nix
deleted file mode 100644
index 62dea05..0000000
--- a/ns3-simulations/nix/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  pkgs ? (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/19.03.tar.gz") {})
-}:
-
-with pkgs; rec {
-
-     ns3 = stdenv.mkDerivation rec {
-        ##### Configure NIX #####
-        name="ns3";
-        sourceRoot="ns-allinone-3.29/ns-3.29/"; # Since we have 2 source tarball (ns-3 & ECOFEN) nix need to know which one to use
-
-        ##### Fetch ns-3 And ECOFEN #####
-        src = [
-            (fetchurl {
-            url = https://www.nsnam.org/releases/ns-allinone-3.29.tar.bz2;
-            sha256 = "0m9dpmby116qk1m4x645i1p92syn30yzn9dgxxji5i25g30abpsd";
-            })
-
-            (fetchurl {
-            url = http://people.irisa.fr/Anne-Cecile.Orgerie/ECOFEN/ecofen-v2.tar.bz2;
-            sha256 = "1dnmm20ihas6hwwb8qbx8sr3h66nrg8h55x6f2aqpf3xima29dyh";
-            })
-        ];
-
-        ##### Configure Dependencies #####
-        buildInputs= [ python gsl ];
-
-        ##### Configure Phases #####
-        postUnpack=''mv ecofen-module-v2 ${sourceRoot}/contrib/ecofen'';
-        configurePhase=''
-        export CXXFLAGS="-Wall -g -O0" # Don't treat warning as error when compiling ns-3
-        python2 waf configure
-        '';
-        buildPhase=''python2 waf'';
-        installPhase=''
-        mkdir -p $out/include
-        cp -r ./build/lib $out/
-        cp -r ./build/ns3 $out/include
-        '';
-    };
-    
-    simulator= stdenv.mkDerivation rec {
-        ##### Configure NIX #####
-        name="simulator";
-        src=./simulator;
-
-        #####  Export ns3 location #####
-        NS3_PATH=ns3;
-
-        ##### Configure Phases #####
-        buildPhase=''make'';
-        installPhase=''
-        mkdir -p $out/bin
-        install -D -t $out/bin simulator
-        '';
-
-      };
-}
diff --git a/ns3-simulations/nix/simulator/Makefile b/ns3-simulations/nix/simulator/Makefile
deleted file mode 100644
index 63c0141..0000000
--- a/ns3-simulations/nix/simulator/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-EXEC=simulator
-
-##### NS3 g++ Arguments
-NS3_ARGS= -D NS3_LOG_ENABLE -L ${NS3_PATH}/lib -I ${NS3_PATH}/include
-NS3_ARGS+=$(addprefix -l, $(subst lib,,$(subst .so,,$(notdir $(wildcard ${NS3_PATH}/lib/libns3*.so)))))
-NS3_VERSION="3.29"
-
-
-##### Source Files
-SRC=main.cc modules/platform.cc modules/energy.cc modules/callbacks.cc
-
-
-all: $(EXEC)
-
-$(EXEC): $(SRC)
-	@echo -e "\e[32mDon't forget to define NS3_PATH env variable !\e[0m"
-	g++ -g  -D NS3_VERSION=${NS3_VERSION} $(NS3_ARGS) $(SRC) -o $@ 
-	@echo -e "\e[32mRun the following command before running $(EXEC):\e[0m"
-	@echo -e "\e[32mexport LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NS3_PATH}/lib\e[0m"
-
-clean:
-	- rm $(EXEC)
-
-
-.PHONY: clean
diff --git a/ns3-simulations/nix/simulator/main.cc b/ns3-simulations/nix/simulator/main.cc
deleted file mode 100644
index cb38ead..0000000
--- a/ns3-simulations/nix/simulator/main.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "modules/modules.hpp"
-#ifndef NS3_VERSION
-#define NS3_VERSION "unknown"
-#endif
-
-NS_LOG_COMPONENT_DEFINE ("WIFISensorsSimulator");
-
-
-/**
- * To get more details about functions please have a look at modules/modules.hpp
- */
-int main(int argc, char* argv[]){
-
-  uint32_t sensorsFrequency=1;
-  uint32_t sensorsPktSize=192; // 128 bits for sensors id and 32 bit for the temperature (an arbitrary Integer) and a timestamp (32bits)
-  uint32_t sensorsNumber=2;
-  uint32_t nbHop=5;
-  uint32_t linksBandwidth=5;
-  uint32_t linksLatency=2;
-  uint32_t positionSeed=5;
-
-  CommandLine cmd;
-  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", nbHop);
-  cmd.AddValue ("linksBandwidth", "Links bandwidth between AP and Cloud", linksBandwidth);
-  cmd.AddValue ("linksLatency", "Links latency between AP and Cloud", linksLatency);
-  cmd.AddValue ("positionSeed", "RandomRectangle Sensors placement seed", positionSeed);
-  cmd.Parse (argc, argv);
-
-  // Check sensors frequency
-  if(sensorsFrequency<1){
-    NS_LOG_UNCOND("SensorsSendInterval too small: " << sensorsFrequency << " (it should be >1)." );
-    exit(1);
-  }
-  
-  //LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
-  //LogComponentEnable("PacketSink", LOG_LEVEL_INFO);
-
-  // ---------- Setup Simulations ----------
-  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),positionSeed); // Use first cloud node as Access Point
-  setupScenario(cell,cloud,sensorsPktSize,sensorsFrequency); // Send data from Sensors to Cloud
-  DeviceEnergyModelContainer wifi=setupCellEnergy(cell);
-  
-  // Don't forget the following
-  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
-  
-  // Setup Logs
-  uint32_t nNode=ns3::NodeList::GetNNodes();
-  FlowMonitorHelper flowmon;
-  Ptr<FlowMonitor> monitor = flowmon.InstallAll();
-  Ptr<Ipv4FlowClassifier> classifier = DynamicCast<Ipv4FlowClassifier> (flowmon.GetClassifier ());
-  
-  // Run Simulations  
-  Simulator::Stop (Seconds (SIM_TIME));
-  Simulator::Run ();
-
-  // Print logs
-  NS_LOG_UNCOND("NS-3 Version " << NS3_VERSION);
-  NS_LOG_UNCOND("Simulation used "<< nNode << " nodes");
-  std::map<FlowId, FlowMonitor::FlowStats> stats = monitor->GetFlowStats ();
-  for (std::map< FlowId, FlowMonitor::FlowStats>::iterator flow=stats.begin(); flow!=stats.end(); flow++)
-    {
-      Ipv4FlowClassifier::FiveTuple  t = classifier->FindFlow(flow->first);
-      NS_LOG_UNCOND("Flow " <<t.sourceAddress<<  " -> "<< t.destinationAddress << " delay = " <<flow->second.delaySum.GetSeconds()); 
-    }
-
-
-  // Trace
-  DeviceEnergyModelContainer::Iterator it=wifi.Begin();
-  int i=0; // Note that node 0 is the AP
-  while(it!=wifi.End()){
-    NS_LOG_UNCOND ("Node " << i << " consumes " <<(*it)->GetTotalEnergyConsumption());
-    it++;
-    i--; // Edge device will have id < 0 and ap will have id 0
-  }
-
-  
-  // Finish
-  Simulator::Destroy ();  
-  return(0);
-}
diff --git a/ns3-simulations/nix/simulator/modules/#callbacks.cc# b/ns3-simulations/nix/simulator/modules/#callbacks.cc#
deleted file mode 100644
index d68e82c..0000000
--- a/ns3-simulations/nix/simulator/modules/#callbacks.cc#
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include "modules.hpp"
-
-void PktReceived(std::string nodeName,Ptr< const Packet > packet, const Address &address){
-  NS_LOG_UNCOND("Node " << nodeName << " receive a packet" << " at time " << Simulator::Now ().GetSeconds () << "s");
-}
-
-void EnergyUpdated(std::string nodeName,double oldValue, double newValue){
-  double currentTime=Simulator::Now ().GetSeconds ();
-  :q!  double energyConsumes=newValue-oldValue;
-  NS_LOG_UNCOND("Node " << nodeName << " consumes " <<  energyConsumes << "J" << " at time " << currentTime  << "s");
-}
diff --git a/ns3-simulations/nix/simulator/modules/callbacks.cc b/ns3-simulations/nix/simulator/modules/callbacks.cc
deleted file mode 100644
index 4ae0c97..0000000
--- a/ns3-simulations/nix/simulator/modules/callbacks.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include "modules.hpp"
-
-void PktReceived(std::string nodeName,Ptr< const Packet > packet, const Address &address){
-  NS_LOG_UNCOND("Node " << nodeName << " receive a packet" << " at time " << Simulator::Now ().GetSeconds () << "s");
-}
-
-void EnergyUpdated(std::string nodeName,double oldValue, double newValue){
-  double currentTime=Simulator::Now ().GetSeconds ();
-  double energyConsumes=newValue-oldValue;
-  NS_LOG_UNCOND("Node " << nodeName << " consumes " <<  energyConsumes << "J" << " at time " << currentTime  << "s");
-}
diff --git a/ns3-simulations/nix/simulator/modules/energy.cc b/ns3-simulations/nix/simulator/modules/energy.cc
deleted file mode 100644
index 56c38e5..0000000
--- a/ns3-simulations/nix/simulator/modules/energy.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-
-#include "modules.hpp"
-
-DeviceEnergyModelContainer setupCellEnergy(Cell cell){
-  NodeContainer nodes(cell.first.first,cell.first.second);
-  NetDeviceContainer nodesNetDev(cell.second.first,cell.second.second);
-
-  // Install energy source
-  BasicEnergySourceHelper edgeBasicSourceHelper;
-  edgeBasicSourceHelper.Set ("BasicEnergySourceInitialEnergyJ", DoubleValue (BASICENERGYSOURCEINITIALENERGYJ));
-  edgeBasicSourceHelper.Set ("BasicEnergySupplyVoltageV", DoubleValue (BASICENERGYSUPPLYVOLTAGEV));
-  EnergySourceContainer apEdgeNodesSources = edgeBasicSourceHelper.Install (cell.first.first);
-  EnergySourceContainer wifiEdgeNodesSources = edgeBasicSourceHelper.Install (cell.first.second);
-
-  // Install device energy model
-  WifiRadioEnergyModelHelper radioEnergyHelper;
-  radioEnergyHelper.Set ("TxCurrentA", DoubleValue (TXCURRENTA));
-  radioEnergyHelper.Set ("RxCurrentA", DoubleValue (RXCURRENTA));
-  radioEnergyHelper.Set ("IdleCurrentA", DoubleValue (IDLECURRENTA));
-  DeviceEnergyModelContainer edgeApDeviceModels = radioEnergyHelper.Install (cell.second.first, apEdgeNodesSources);
-  DeviceEnergyModelContainer edgeDeviceModels = radioEnergyHelper.Install (cell.second.second, wifiEdgeNodesSources);
-
-  
-  // Trace
-  //  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));
-  // //device energy model
-  // Ptr<DeviceEnergyModel> basicRadioModelPtr0 =
-  // basicSourcePtr0->FindDeviceEnergyModels ("ns3::WifiRadioEnergyModel").Get (0);
-  // NS_ASSERT (basicRadioModelPtr0 != NULL);
-  // basicRadioModelPtr0->TraceConnectWithoutContext ("TotalEnergyConsumption", MakeCallback (&TotalEnergy));
-  return(DeviceEnergyModelContainer(edgeApDeviceModels,edgeDeviceModels));
-}
-
-void setupCloudEnergy(CloudInfos cloudInfos){
-  NodeContainer cloudNodes=cloudInfos.first;
-  
-  // Install basic energy
-  ns3::BasicNodeEnergyHelper basicNodeEnergy;
-  basicNodeEnergy.Set("OnConso", ns3::DoubleValue (ONCONSO));
-  basicNodeEnergy.Set("OffConso", ns3::DoubleValue (OFFCONSO));
-  basicNodeEnergy.Install (cloudNodes);
-
-  ns3::CompleteNetdeviceEnergyHelper completeNetdeviceEnergy;
-  completeNetdeviceEnergy.Set ("OffConso", ns3::DoubleValue (OFFCONSO));
-  completeNetdeviceEnergy.Set ("IdleConso", ns3::DoubleValue (IDLECONSO));
-  completeNetdeviceEnergy.Set ("RecvByteEnergy", ns3::DoubleValue (RECVBYTEENERGY));
-  completeNetdeviceEnergy.Set ("SentByteEnergy", ns3::DoubleValue (SENTBYTEENERGY));
-  completeNetdeviceEnergy.Set ("RecvPktEnergy", ns3::DoubleValue (RECVPKTENERGY));
-  completeNetdeviceEnergy.Set ("SentPktEnergy", ns3::DoubleValue (SENTPKTENERGY));
-  completeNetdeviceEnergy.Install(cloudNodes);
-  
-  ns3::ConsumptionLogger conso;
-  conso.NodeConso(ns3::Seconds (ECOFEN_LOG_EVERY), ns3::Seconds(SIM_TIME), cloudNodes);
-}
-
diff --git a/ns3-simulations/nix/simulator/modules/modules.hpp b/ns3-simulations/nix/simulator/modules/modules.hpp
deleted file mode 100644
index 7bc5c2a..0000000
--- a/ns3-simulations/nix/simulator/modules/modules.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#ifndef MODULES_HPP
-#define MODULES_HPP
-
-#include "ns3/command-line.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/log.h"
-#include "ns3/yans-wifi-helper.h"
-#include "ns3/ssid.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/on-off-helper.h"
-#include "ns3/yans-wifi-channel.h"
-#include "ns3/mobility-model.h"
-#include "ns3/packet-sink.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-echo-helper.h"
-#include "ns3/tcp-westwood.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-global-routing-helper.h"
-#include "ns3/constant-position-mobility-model.h"
-#include "ns3/energy-module.h"
-#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"
-#include "ns3/flow-monitor-module.h"
-
-// C++ library
-#include <iostream> // Why not ?
-#include <utility>  // To use std::pair
-#include <iomanip>  // To use std::setw
-
-#define SIM_TIME 1800 // 30mins simulations
-#define RECT_SIZE 30 // Sensors random rectangle position size
-#define MAX_PACKET_BY_SENSOR 900000 // Reasonable big number (in order that simulation end before sensors stop sending packets)
-
-// ECOFEN
-#define ECOFEN_LOG_EVERY 0.5
-
-// WIFI Energy Values
-#define BASICENERGYSOURCEINITIALENERGYJ 10000000
-#define BASICENERGYSUPPLYVOLTAGEV 3.3
-#define TXCURRENTA 0.38
-#define RXCURRENTA 0.313
-#define IDLECURRENTA 0.273
-
-// Cloud Energy Values
-#define ONCONSO 0
-#define OFFCONSO 0
-#define IDLECONSO 1
-#define RECVBYTEENERGY 3.4
-#define SENTBYTEENERGY 3.4
-#define RECVPKTENERGY 192.2
-#define SENTPKTENERGY 192.2
-
-using namespace ns3;
-
-// ---------- Data types ----------
-typedef std::pair<NodeContainer,NodeContainer> CellNodes; // Format (APNode, SensorsNodes)
-typedef std::pair<NetDeviceContainer,NetDeviceContainer> CellNetDevices; // Format (APNetDev, SensorsNetDev)
-typedef std::pair<CellNodes,CellNetDevices> Cell;
-typedef std::pair<Ipv4Address,int> EndPoint; // Format (IP,Port)
-typedef std::pair<NodeContainer,EndPoint> CloudInfos; // Format (CloudHops,CloudEndPoint), here data sent to CloudEndPoint
-
-
-// ---------- platform.cc ----------
-/**
- * Create a WIFI cell paltform composed of nbSensors sensors and ap as an access point
- */
-Cell createCell(uint32_t nbSensors, Ptr<ns3::Node> ap,int positionSeed);
-
-/**
- * Build P2P network composed of nbHop hops (to simulate edge->cloud communications)
- * Note: Cloud Servers are not considered here and completely ignored !
- */
-CloudInfos createCloud(int nbHop, uint32_t bandwidth, uint32_t latency);
-/**
- * Setup simulation scenario on the platforms. Sensors in cell will send packets of sensorsPktSize size every
- * sensorsSensInterval second to the cloud using cloudInfos.
- */
-void setupScenario(Cell cell, CloudInfos cloudInfos, int sensorsPktSize, int sensorsSendInterval);
-
-
-// ---------- energy.cc ----------
-/*
- * Configure WIFI energy module for cell
- */
-DeviceEnergyModelContainer setupCellEnergy(Cell cell);
-/*
- * Configure link/port energy using ecofen
- */
-void setupCloudEnergy(CloudInfos cloudInfos);
-
-
-// ---------- callbacks.cc ----------
-void PktReceived(std::string nodeName,Ptr< const Packet > packet, const Address &address);
-void EnergyUpdated(std::string nodeName,double oldValue, double newValue);
-
-
-
-#endif
diff --git a/ns3-simulations/nix/simulator/modules/platform.cc b/ns3-simulations/nix/simulator/modules/platform.cc
deleted file mode 100644
index 7cfc2b9..0000000
--- a/ns3-simulations/nix/simulator/modules/platform.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "modules.hpp"
-#include "ns3/pointer.h"
-
-/**
- * Create a sensors cell base on
- * nbSensors Number of temperature sensors in the cell
- * ap the Access Point (usually linked to the cloud)
- */
-Cell createCell(uint32_t nbSensors, Ptr<ns3::Node> ap,int positionSeed){
-  // Create sensors
-  NodeContainer sensors;
-  sensors.Create(nbSensors);
-
-
-  // Define sensors position/mobility
-  MobilityHelper mobility;
-  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel"); // Sensors are fixed
-  Ptr<UniformRandomVariable> X = CreateObject<UniformRandomVariable> ();
-  X->SetAttribute ("Min", DoubleValue (0));
-  X->SetAttribute ("Max", DoubleValue (RECT_SIZE));
-  X->SetAttribute("Stream",IntegerValue(positionSeed));
-  Ptr<UniformRandomVariable> Y = CreateObject<UniformRandomVariable> ();
-  Y->SetAttribute ("Min", DoubleValue (0));
-  Y->SetAttribute ("Max", DoubleValue (RECT_SIZE));
-  Y->SetAttribute("Stream",IntegerValue(positionSeed+1));
-  mobility.SetPositionAllocator("ns3::RandomRectanglePositionAllocator",
-                                "X",PointerValue(X),
-                                "Y",PointerValue(Y));
-  mobility.Install(NodeContainer(ap,sensors));  
-
-  // To apply XXWifiPhy and WifiMac on sensors 
-  WifiHelper wifiHelper;
-  wifiHelper.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
-
-  /* Set up Legacy Channel */
-  YansWifiChannelHelper wifiChannel;
-  wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
-  wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel", "Frequency", DoubleValue (5e9));
-
-  /* Setup Physical Layer */
-  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
-  wifiPhy.SetChannel (wifiChannel.Create ());
-  wifiPhy.Set ("TxPowerStart", DoubleValue (10.0));
-  wifiPhy.Set ("TxPowerEnd", DoubleValue (10.0));
-  wifiPhy.Set ("TxPowerLevels", UintegerValue (1));
-  wifiPhy.Set ("TxGain", DoubleValue (0));
-  wifiPhy.Set ("RxGain", DoubleValue (0));
-  wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));
-  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));
-  //  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
-  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
-                                      "DataMode", StringValue ("HtMcs7"),
-                                      "ControlMode", StringValue ("HtMcs0"));
-  /* Configure AP */
-  Ssid ssid = Ssid ("network");
-  WifiMacHelper wifiMac;
-  wifiMac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid));
-  NetDeviceContainer apNetDevice;
-  apNetDevice = wifiHelper.Install (wifiPhy, wifiMac, ap);
-  /* Configure STA */
-  wifiMac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid));
-  NetDeviceContainer sensorsNetDevices;
-  sensorsNetDevices = wifiHelper.Install (wifiPhy, wifiMac, sensors);
-
-  return(std::make_pair(std::make_pair(ap,sensors),std::make_pair(apNetDevice,sensorsNetDevices)));
-}
-
-/**
- * Install network stack and applications
- */
-void setupScenario(Cell cell, CloudInfos cloudInfos, int sensorsPktSize, int sensorsSendInterval){
-  NodeContainer ap=cell.first.first;
-  NodeContainer sensors=cell.first.second;
-  NetDeviceContainer apNetDev= cell.second.first;
-  NetDeviceContainer sensorsNetDev= cell.second.second;
-  
-  // 6. Install TCP/IP stack & assign IP addresses
-  InternetStackHelper internet;
-  //  internet.Install (ap);
-  internet.Install (sensors);
-  Ipv4AddressHelper ipv4;
-  ipv4.SetBase ("10.0.0.0", "255.255.0.0");
-  Ipv4InterfaceContainer apInt,sensorsInt;
-  apInt=ipv4.Assign(apNetDev);
-  sensorsInt=ipv4.Assign(sensorsNetDev);
-
-  UdpEchoClientHelper echoClientHelper (InetSocketAddress (cloudInfos.second.first, cloudInfos.second.second));
-  echoClientHelper.SetAttribute ("Interval", TimeValue (Seconds (sensorsSendInterval)));
-  echoClientHelper.SetAttribute ("PacketSize", UintegerValue (sensorsPktSize));
-  echoClientHelper.SetAttribute ("MaxPackets", UintegerValue (MAX_PACKET_BY_SENSOR));
-  ApplicationContainer pingApps;
-
-  // again using different start times to workaround Bug 388 and Bug 912
-  for(int i=0;i<sensors.GetN();i++){
-    echoClientHelper.SetAttribute ("StartTime", TimeValue (MilliSeconds (1+i)));
-    echoClientHelper.Install (sensors.Get(i));
-  }
-}
-
-
-CloudInfos createCloud(int nbHop, uint32_t bandwidth, uint32_t latency){
- 
-  NodeContainer HopNodes;
-  HopNodes.Create(nbHop);
-  InternetStackHelper stack;
-  stack.Install(HopNodes);
-
-  Ipv4Address cloudIP; // Will be fill in the following for loop
-  int cloudPort=80;
-  for(int i=0;i<nbHop-1;i++){
-    NodeContainer curNodes(HopNodes.Get(i),HopNodes.Get(i+1));
-
-    PointToPointHelper pointToPoint;
-    pointToPoint.SetDeviceAttribute ("DataRate", StringValue ((std::to_string(bandwidth)+"Mbps").c_str()));
-    pointToPoint.SetChannelAttribute ("Delay", StringValue ((std::to_string(latency)+"ms").c_str()));
-
-    NetDeviceContainer p2pDevices;
-    p2pDevices = pointToPoint.Install (curNodes);
-
-    Ipv4AddressHelper address;
-    address.SetBase (("10."+std::to_string(i+1)+".0.0").c_str(), "255.255.0.0"); // Remember: 10.0.0.0 is used by WIFI
-    Ipv4InterfaceContainer p2pInterfaces;
-    p2pInterfaces = address.Assign (p2pDevices);
-
-    if(i==nbHop-2){ // If we are on the last for loop (before last node)
-      cloudIP=p2pInterfaces.GetAddress (1); // Get Last node interface
-      PacketSinkHelper apSink("ns3::UdpSocketFactory",InetSocketAddress (Ipv4Address::GetAny (), cloudPort));
-      ApplicationContainer sinkApp=apSink.Install(curNodes.Get(1)); // Instal sink on last node
-      sinkApp.Get(0)->TraceConnect("Rx","CloudSwitch",MakeCallback(&PktReceived));
-      sinkApp.Start (Seconds (0));
-    }
-  }
-
-  return(std::make_pair(HopNodes,std::make_pair(cloudIP,cloudPort)));
-
-}