Add new simulations

g5k/logs/.#analysis.org

@@ -1 +0,0 @@
-loic@lguegan.5093:1558079377

g5k/logs/analysis.org

@@ -5,12 +5,17 @@
 * Logs Analysis
 ** R Scripts
 *** Generate all plots script
-    #+BEGIN_SRC R
-      #<<RUtils>>
+    #+BEGIN_SRC R :results graphics :file second-try/plot.png :noweb yes
+      <<RUtils>>
+      data=loadData("./second-try/data.csv")
 
-
-      energy=loadEnergy
+      data=data%>%filter(simKey=="nbSensors")%>%filter(nbSensors==20)
+      ggplot(data,aes(x=time,y=energy))+geom_point(position="jitter")+xlab(getLabel("time"))+expand_limits(y=0)#+geom_hline(aes(group=nbSensors,color=nbSensors,yintercept=mean(energy)))
+      ggsave("./second-try/plot.png",dpi=80)
     #+END_SRC
+
+    #+RESULTS:
+    [[file:second-try/plot.png]]
     
 
 *** R Utils
@@ -22,17 +27,10 @@
       library("tidyverse")
 
       # Fell free to update the following
-      labels=c(nbNodes="Number of nodes",sensorsNumber="Number of sensors",totalEnergy="Total Energy (J)",
-        nbHop="Number of hop (AP to Cloud)", linksBandwidth="Links Bandwidth (Mbps)", avgDelay="Average Application Delay (s)",
-        linksLatency="Links Latency (ms)", sensorsSendInterval="Sensors Send Interval (s)", positionSeed="Position Seed",
-        sensorsEnergy="Sensors Wifi Energy Consumption (J)", networkEnergy="Network Energy Consumption (J)")
-
-      # Load Data
-      data=read_csv("logs/data.csv")
-
+      labels=c(time="Time (s)")
+   
       loadData=function(path){
         data=read_csv(path)
-        data%>%mutate(time=ts-min(ts))
       }
 
       # Get label according to varName
@@ -83,17 +81,15 @@
      emacs $orgFile --batch -f org-latex-export-to-pdf --kill  
    #+END_SRC
 
-   #+RESULTS:
-
-
  
 ** CSVs -> CSV
+   Merge all energy file into one (and add additional fields).
 
    #+NAME: mergeCSV
-   #+BEGIN_SRC sh :results output
+   #+BEGIN_SRC sh
      #!/bin/bash
 
-     whichLog="first-try"
+     whichLog="second-try"
 
 
      logFile="$(dirname $(readlink -f $0))"/$whichLog/simLogs.txt
@@ -118,13 +114,14 @@
          simKey=$(getValue $cmd simKey)
          csvFile="$whichLog/${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}.csv"
          tmpFile=${csvFile}_tmp
-         echo ts,energy,simKey,vmSize,nbSensors > $tmpFile
-         tail -n+2 ${csvFile} | awk '{print $0",'$simKey','$vmSize','$nbSensors'"}' >> $tmpFile
+         echo ts,energy,simKey,vmSize,nbSensors,time > $tmpFile
+         minEnergy=$(tail -n+2 $csvFile|awk -F"," 'BEGIN{min=0}$1<min||min==0{min=$1}END{print(min)}') # To compute ts field
+         tail -n+2 ${csvFile} | awk -F"," '{print $0",'$simKey','$vmSize','$nbSensors',"$1-'$minEnergy'}' >> $tmpFile
      done
 
 
      ##### File dataFile #####
-     echo ts,energy,simKey,vmSize,nbSensors > $dataFile
+     echo ts,energy,simKey,vmSize,nbSensors,time > $dataFile
      for tmpFile in $(find ${whichLog}/*_tmp -type f)
      do
          tail -n+2 $tmpFile >> $dataFile
@@ -132,7 +129,9 @@
      done
    #+END_SRC
 
-   #+RESULTS:
+   #+RESULTS: mergeCSV
+
+
 
 ** Custom Plots
 

g5k/logs/second-try/README.md

@@ -0,0 +1,4 @@
+Some energies values are missing for the file:
+nbSensors_2048VMSIZE_20NBSENSORS_15581087311558109034.csv
+
+I don't know whether G5K add somes bugs or whatever.

g5k/logs/second-try/simLogs.txt

@@ -0,0 +1,30 @@
+---------- Simulation (key=vmSize) start at 1558107414 (Fri May 17 17:36:54 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:20 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:vmSize simStart:1558107414 simEnd:1558107717 duration:303 serverNodeName:nova-15 vmSize:1024
+./recordEnergy.sh nova nova-15 1558107414 1558107717 energy_vmSize_20NS_1024vmSize_1558107414_1558107717.csv
+---------- Simulation (key=vmSize) end at 1558107717 (Fri May 17 17:41:57 CEST 2019)
+
+---------- Simulation (key=vmSize) start at 1558107853 (Fri May 17 17:44:13 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:20 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:vmSize simStart:1558107853 simEnd:1558108156 duration:303 serverNodeName:nova-15 vmSize:2048
+./recordEnergy.sh nova nova-15 1558107853 1558108156 energy_vmSize_20NS_2048vmSize_1558107853_1558108156.csv
+---------- Simulation (key=vmSize) end at 1558108156 (Fri May 17 17:49:16 CEST 2019)
+
+---------- Simulation (key=vmSize) start at 1558108293 (Fri May 17 17:51:33 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:20 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:vmSize simStart:1558108293 simEnd:1558108595 duration:302 serverNodeName:nova-15 vmSize:4096
+./recordEnergy.sh nova nova-15 1558108293 1558108595 energy_vmSize_20NS_4096vmSize_1558108293_1558108595.csv
+---------- Simulation (key=vmSize) end at 1558108595 (Fri May 17 17:56:35 CEST 2019)
+
+---------- Simulation (key=nbSensors) start at 1558108731 (Fri May 17 17:58:51 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:20 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:nbSensors simStart:1558108731 simEnd:1558109034 duration:303 serverNodeName:nova-15 vmSize:2048
+./recordEnergy.sh nova nova-15 1558108731 1558109034 energy_nbSensors_20NS_2048vmSize_1558108731_1558109034.csv
+---------- Simulation (key=nbSensors) end at 1558109034 (Fri May 17 18:03:54 CEST 2019)
+
+---------- Simulation (key=nbSensors) start at 1558109171 (Fri May 17 18:06:11 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:100 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:nbSensors simStart:1558109171 simEnd:1558109482 duration:311 serverNodeName:nova-15 vmSize:2048
+./recordEnergy.sh nova nova-15 1558109171 1558109482 energy_nbSensors_100NS_2048vmSize_1558109171_1558109482.csv
+---------- Simulation (key=nbSensors) end at 1558109482 (Fri May 17 18:11:22 CEST 2019)
+
+---------- Simulation (key=nbSensors) start at 1558109621 (Fri May 17 18:13:41 CEST 2019)
+Simulation parameters: serverNode:nova-15.lyon.grid5000.fr serverIp:10.140.16.1 serverMac:00:16:3E:8C:10:01 clientNode:nova-10.lyon.grid5000.fr clientNode:nova-10.lyon.grid5000.fr clientMac: delay:60 nbSensors:300 nbSensorsFactor:3 requestPerSensors:30 sensorsRequestPerSec: simKey:nbSensors simStart:1558109621 simEnd:1558109955 duration:334 serverNodeName:nova-15 vmSize:2048
+./recordEnergy.sh nova nova-15 1558109621 1558109955 energy_nbSensors_300NS_2048vmSize_1558109621_1558109955.csv
+---------- Simulation (key=nbSensors) end at 1558109955 (Fri May 17 18:19:15 CEST 2019)
+