Update simulations

4 files changed, 6 insertions, 5 deletions

diff --git a/ns3-simulations/simulator/main.cc b/ns3-simulations/simulator/main.cc
index e170875..b7f043c 100644
--- a/ns3-simulations/simulator/main.cc
+++ b/ns3-simulations/simulator/main.cc
@@ -45,7 +45,7 @@ int main(int argc, char* argv[]){
   Ptr<Ipv4FlowClassifier> classifier = DynamicCast<Ipv4FlowClassifier> (flowmon.GetClassifier ());
   
   // Run Simulations  
-  Simulator::Stop (Seconds (30));
+  Simulator::Stop (Seconds (SIM_TIME));
   Simulator::Run ();
 
   // Print logs
diff --git a/ns3-simulations/simulator/modules/energy.cc b/ns3-simulations/simulator/modules/energy.cc
index 11f1c7a..c8cca6a 100644
--- a/ns3-simulations/simulator/modules/energy.cc
+++ b/ns3-simulations/simulator/modules/energy.cc
@@ -63,6 +63,6 @@ void setupCloudEnergy(CloudInfos cloudInfos){
   completeNetdeviceEnergy.Install(cloudNodes);
   
   ns3::ConsumptionLogger conso;
-  conso.NodeConso(ns3::Seconds (ECOFEN_LOG_EVERY), ns3::Seconds(ECOFEN_LOG_UNTIL), cloudNodes);
+  conso.NodeConso(ns3::Seconds (ECOFEN_LOG_EVERY), ns3::Seconds(SIM_TIME), cloudNodes);
 }
 
diff --git a/ns3-simulations/simulator/modules/modules.hpp b/ns3-simulations/simulator/modules/modules.hpp
index ec823c9..b537e92 100644
--- a/ns3-simulations/simulator/modules/modules.hpp
+++ b/ns3-simulations/simulator/modules/modules.hpp
@@ -33,12 +33,13 @@
 #include <utility>  // To use std::pair
 #include <iomanip>  // To use std::setw
 
+#define SIM_TIME 60
+
 // ECOFEN
-#define ECOFEN_LOG_UNTIL 100
-#define ECOFEN_LOG_EVERY 0.1
+#define ECOFEN_LOG_EVERY 0.5
 
 // WIFI Energy Values
-#define BASICENERGYSOURCEINITIALENERGYJ 10
+#define BASICENERGYSOURCEINITIALENERGYJ 10000
 #define BASICENERGYSUPPLYVOLTAGEV 3.3
 #define TXCURRENTA 0.38
 #define RXCURRENTA 0.313
diff --git a/ns3-simulations/simulator/simulator b/ns3-simulations/simulator/simulator
index acd36d8..ed894ca 100755
--- a/ns3-simulations/simulator/simulator
+++ b/ns3-simulations/simulator/simulator