Fixed timers

Author: LucaParenti

src/app/TaskGenerator.cc

@@ -302,7 +302,7 @@ void TaskGenerator::balanceLoad()
 
                     // Set the time to compute as reverse of CDF of an exponential
                     // random variable to match the worst possible case
-                    timeToCompute = par("dataComputationThreshold").doubleValue() + (-log(1 - 0.99) * (1 / estimateTimeToCompute));
+                    timeToCompute = par("dataComputationThreshold").doubleValue() + (-log(1 - 0.99) * estimateTimeToCompute);
                     dataMessage->setComputationTime(timeToCompute);
 
                     // Save into the helper the data partition ID
@@ -314,7 +314,7 @@ void TaskGenerator::balanceLoad()
                         // Calculate bitrate conversion from megabit to megabyte
                         int dataPartitionFragments = std::ceil(dataMessage->getLoadToProcess() / 1500);
                         double bitRate = findModuleByPath(".^.wlan[*]")->par("bitrate").doubleValue() / 8.0;
-                        double transferTime = ((1500 / bitRate) * dataPartitionFragments * n_fragments * helpers.size()) * 2;
+                        double transferTime = ((1500 / bitRate) * dataPartitionFragments) * 2;
 
                         // Set the transfer time in data message
                         dataMessage->setTransferTime(transferTime);
@@ -744,7 +744,7 @@ void TaskGenerator::sendAgainData(DataMessage* data)
             // Calculate bitrate conversion from megabit to megabyte
             int dataPartitionFragments = std::ceil(data->getLoadToProcess() / 1500);
             double bitRate = findModuleByPath(".^.wlan[*]")->par("bitrate").doubleValue() / 8.0;
-            double transferTime = ((1500 / bitRate) * dataPartitionFragments * data->getTotalFragments() * helpers.size()) * 2;
+            double transferTime = ((1500 / bitRate) * dataPartitionFragments) * 2;
 
             // Set new transfer time into data packet
             newData->setTransferTime(transferTime);

src/app/Worker.cc

@@ -256,20 +256,16 @@ void Worker::handleDataMessage(DataMessage* dataMessage)
     double I = dataMessage->getLoadToProcess();
     double CR = cpuFreq;
 
-    double timeToCompute = 0.001 + exponential(1 / (CPI * I * (1 / CR)));
+    double timeToCompute = 0.001 + exponential(CPI * I * (1 / CR));
     EV << "TIME TO COMPUTE" << timeToCompute << endl;
 
     auto key = std::pair<int, int>(dataMessage->getTaskId(), dataMessage->getPartitionId());
 
     // If the cache is not empty it resends the response message tied to this data message
     if(responseCache.find(key) != responseCache.end()){
-        double time = timeToCompute + (dataMessage->getTransferTime() * dataMessage->getTotalFragments()) + par("ackMessageThreshold").doubleValue();
+        double time = timeToCompute + (dataMessage->getTransferTime() * dataMessage->getTotalFragments() * dataMessage->getNumberOfVehicles()) + par("ackMessageThreshold").doubleValue();
         sendAgainResponse(responseCache.at(key), time);
         return;
-    } else {
-        // Increment the number of data partitions I've received only when
-        // is a new partition
-        dataPartitionsReceived++;
     }
 
     // Reset the task availability timer
@@ -309,6 +305,10 @@ void Worker::handleDataMessage(DataMessage* dataMessage)
         responseMessage->setStillAvailable(true);
     }
 
+    // Increment the number of data partitions I've received only when
+    // is a new partition
+    dataPartitionsReceived++;
+
     responseMessage->setDataComputed(dataMessage->getLoadToProcess());
     responseMessage->setTimeToCompute(timeToCompute);
     responseMessage->setTaskID(dataMessage->getTaskId());
@@ -335,7 +335,7 @@ void Worker::handleDataMessage(DataMessage* dataMessage)
     // Generate ACK timer if parameter useAcks is false
     // to achieve secure protocol manually and if I'm not still available
     if (par("useAcks").boolValue() == false) {
-        time = timeToCompute + ((dataMessage->getTransferTime() / 2) * dataMessage->getTotalFragments()) + par("ackMessageThreshold").doubleValue();
+        time = timeToCompute + ((dataMessage->getTransferTime() / 2) * dataMessage->getTotalFragments() * dataMessage->getNumberOfVehicles()) + par("ackMessageThreshold").doubleValue();
 
         // The & inside the square brackets tells to capture all local variable
         // by value