Improve scenarios and analysis

1 files changed, 20 insertions, 20 deletions

diff --git a/src/scenarios.cc b/src/scenarios.cc
index 9395840..f34c9c3 100644
--- a/src/scenarios.cc
+++ b/src/scenarios.cc
@@ -17,10 +17,10 @@ using namespace rapidjson;
 
 int main(int argc, char **argv){
     // Setup seed
-    if(argc!=15){
+    if(argc!=14){
         cerr << "Usage: " << argv[0] <<
-            " <seed> <simtime> <wakeupsd> <wakeupevery> <wakeupfor> <n_nodes>" <<
-            " <extended> <hint> <poff> <pon> <prx> <ptx> <datasize> <simkey>" <<
+            " <seed> <simtime> <wakeupevery> <wakeupfor> <n_nodes>" <<
+            " <extended> <hint> <poff> <pon> <prx> <ptx> <datasize> <bitrate>" <<
             endl;
         exit(1);
     }
@@ -28,18 +28,18 @@ int main(int argc, char **argv){
     // Init parameters
     int seed=atoi(argv[1]);
     double simtime=stod(argv[2]);
-    unsigned int wakeupsd=atoi(argv[3]);
-    unsigned int wakeupevery=atoi(argv[4]);
-    double wakeupfor=stod(argv[5]);
-    unsigned int n_nodes=atoi(argv[6]);
-    bool extended=!strcmp("true",argv[7]);
-    bool hint=!strcmp("true",argv[8]);
-    double poff=stod(argv[9]);
-    double pon=stod(argv[10]);
-    double prx=stod(argv[11]);
-    double ptx=stod(argv[12]);
-    unsigned int datasize=atoi(argv[13]);
-    string simkey(argv[14]);
+    unsigned int wakeupevery=atoi(argv[3]);
+    double wakeupfor=stod(argv[4]);
+    unsigned int n_nodes=atoi(argv[5]);
+    bool extended=!strcmp("true",argv[6]);
+    bool hint=!strcmp("true",argv[7]);
+    double poff=stod(argv[8]);
+    double pon=stod(argv[9]);
+    double prx=stod(argv[10]);
+    double ptx=stod(argv[11]);
+    unsigned int datasize=atoi(argv[12]);
+    string bitrate(argv[13]);
+
 
     // Setup seed
     srand(seed);
@@ -47,10 +47,10 @@ int main(int argc, char **argv){
     // Create document
     Document d;
     d.SetObject();
-    Value simkeyValue;
-    simkeyValue.SetString(simkey.c_str(),simkey.size(),d.GetAllocator());
-    d.AddMember("simkey",simkeyValue,d.GetAllocator());
     d.AddMember("seed",Value().SetInt(seed),d.GetAllocator());
+    Value simkeyValue;
+    simkeyValue.SetString(bitrate.c_str(),bitrate.size(),d.GetAllocator());
+    d.AddMember("bitrate",simkeyValue,d.GetAllocator());
     d.AddMember("extended",extended,d.GetAllocator());
 
     // Create nodes
@@ -69,8 +69,8 @@ int main(int argc, char **argv){
         // Setup ts and durations
         Value ts(kArrayType);
         Value duration(kArrayType);
-        for(unsigned int i=0;(i+wakeupfor)<simtime;i+=RAND(wakeupevery-wakeupsd,wakeupevery+wakeupsd)){
-            ts.PushBack(Value().SetDouble(i),d.GetAllocator());
+        for(unsigned int i=0;i<simtime;i+=wakeupevery){
+            ts.PushBack(Value().SetDouble(RAND(i,i+wakeupevery)),d.GetAllocator());
             duration.PushBack(Value().SetDouble(wakeupfor),d.GetAllocator());
         }
         node.AddMember("wake_ts",ts,d.GetAllocator());