From bf9646552888e022c22139448c33c1b219b9e713 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerberdes@gmx.com>
Date: Mon, 29 Apr 2019 09:00:49 +0200
Subject: Update simulations

---
 ns3-simulations/simulator/modules/energy.cc   | 2 +-
 ns3-simulations/simulator/modules/modules.hpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'ns3-simulations/simulator/modules')

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
-- 
cgit v1.2.3