Update network energy consumption

.#2019-ICA3PP.org

@@ -1 +0,0 @@
-loic@lguegan.29280:1563296642

2019-ICA3PP.org

@@ -623,7 +623,7 @@ In our case with small and sporadic network traffic, these results show that wit
          Core router & ~Static power = 555 Watts, 48 ports of 1 Gbps, Utilization = 25\% \\
          Edge switch~ & ~Static power = 150 Watts, 48 ports of 1 Gbps, Utilization = 25\% \\
          \bottomrule
-     \end{tabular}}
+     \end{tabular}
    \end{table}
    #+END_EXPORT
 
@@ -762,6 +762,7 @@ and provide advice for increasing the energy-efficiency of IoT infrastructures.
           if("sensorsEnergy"%in%colnames(data)){ # If it is ns3 logs
             data=data%>%mutate(sensorsEnergy=sensorsEnergy/ns3SimTime)  # Convert to watts
             data=data%>%mutate(networkEnergy=networkEnergy/ns3SimTime)
+            data=data%>%mutate(networkEnergy=networkEnergy-9.9999) # Anne-Cécile Factor (accounting for port idle (in fact we are not using all the 1W, there is also other communication on ISP switches) 
             data=data%>%mutate(networkEnergy=networkEnergy+getSwitchesIDLE(sensorsNumber,sensorsSendInterval)) # Add Idle conso of switches
             data=data%>%mutate(totalEnergy=totalEnergy/ns3SimTime)
           }
@@ -1105,7 +1106,7 @@ and provide advice for increasing the energy-efficiency of IoT infrastructures.
 **** Plot In Paper
 
      Power sensors vs network
-     #+BEGIN_SRC R :noweb yes :results graphics  :file plots/numberSensors-WIFINET.png :session *R*
+     #+BEGIN_SRC R :noweb yes :results graphics :file plots/numberSensors-WIFINET.png :session *R*
        <<RUtils>>
 
        data=loadData("logs/ns3/last/data.csv")