fix(daisi): Adapt data types and casting

iml130 · Oct 11, 2023 · e45841c · e45841c
1 parent 0a370bf
commit e45841c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/daisi/src/cpps/common/scenariofile/amr_description_scenario.h b/daisi/src/cpps/common/scenariofile/amr_description_scenario.h
@@ -44,7 +44,7 @@ struct AmrLoadHandlingScenario {
   double load_time;
   double unload_time;
   std::string load_carrier;
-  double max_payload;
+  float max_payload;
 
   void parse(const YAML::Node &node) {
     SERIALIZE_VAR(load_time);

diff --git a/daisi/src/cpps/common/scenariofile/cpps_scenariofile.cpp b/daisi/src/cpps/common/scenariofile/cpps_scenariofile.cpp
@@ -105,7 +105,7 @@ void CppsScenariofile::verifyScenarioSequenceOfAmrs() const {
       sum += info.spawn_distribution.percentage;
     }
 
-    if (abs(sum - 1) > std::numeric_limits<double>::epsilon()) {
+    if (std::abs(sum - 1) > std::numeric_limits<double>::epsilon()) {
       throw std::runtime_error("Percentages of AMRs in scenario sequence must add up to 1.");
     }
   }
@@ -134,7 +134,7 @@ void CppsScenariofile::calcNumbersOfRelativeAmrDistribution() {
   // total number * percentage
   for (auto i = 0U; i < amrs.size(); i++) {
     auto percentage = amrs[i].spawn_distribution.percentage;
-    absolute.push_back(std::floor(percentage * initial_number_of_amrs));
+    absolute.push_back(static_cast<uint16_t>(std::floor(percentage * initial_number_of_amrs)));
     gaps.push_back({i, percentage * initial_number_of_amrs - absolute[i]});
   }
 

diff --git a/daisi/src/cpps/logical/task_management/metrics.cpp b/daisi/src/cpps/logical/task_management/metrics.cpp
@@ -91,7 +91,7 @@ Metrics Metrics::operator-(const Metrics &other) const {
                empty_travel_distance - other.empty_travel_distance,
                loaded_travel_distance - other.loaded_travel_distance};
 
-  diff.setMakespan(abs(getMakespan() - other.getMakespan()));
+  diff.setMakespan(std::abs(getMakespan() - other.getMakespan()));
   return diff;
 }
 

diff --git a/daisi/src/minhton-ns3/minhton_manager_scheduler.h b/daisi/src/minhton-ns3/minhton_manager_scheduler.h
@@ -52,8 +52,8 @@ class MinhtonManager::Scheduler {
   void executeOneFailByIndex(uint16_t index);
   void executeOneRandomFail();
 
-  void initiateJoinNow(uint64_t node_to_join_to_index, uint64_t entering_node_index);
-  void initiateJoinNowDiscover(uint64_t entering_node_index);
+  void initiateJoinNow(uint32_t node_to_join_to_index, uint32_t entering_node_index);
+  void initiateJoinNowDiscover(uint32_t entering_node_index);
   void initiateLeaveNow(uint64_t node_to_leave_to_index);
   void initiateFailureNow(uint64_t node_to_fail_to_index);
 

diff --git a/daisi/src/minhton-ns3/minhton_manager_scheduler_helper.cpp b/daisi/src/minhton-ns3/minhton_manager_scheduler_helper.cpp
@@ -43,7 +43,7 @@ void MinhtonManager::Scheduler::setupRequestingNodes() {
   if (!requests_off_) {
     std::vector<std::string> all_ips;
 
-    for (uint64_t i = 0; i < manager_.nodes_.GetN(); i++) {
+    for (uint32_t i = 0; i < manager_.nodes_.GetN(); i++) {
       auto app = manager_.nodes_.Get(i)->GetApplication(0)->GetObject<MinhtonApplication>();
 
       all_ips.push_back(app->getNodeInfo().getAddress());
@@ -107,7 +107,7 @@ void MinhtonManager::Scheduler::executeOneJoinByPosition(uint32_t level, uint32_
   }
 
   bool found_initialized_node_at_pos = false;
-  for (uint64_t join_to_index = 0; join_to_index < manager_.nodes_.GetN(); join_to_index++) {
+  for (uint32_t join_to_index = 0; join_to_index < manager_.nodes_.GetN(); join_to_index++) {
     auto app =
         manager_.nodes_.Get(join_to_index)->GetApplication(0)->GetObject<MinhtonApplication>();
 
@@ -191,7 +191,7 @@ void MinhtonManager::Scheduler::Scheduler::executeOneRandomJoin() {
 }
 
 // Join via Multicast
-void MinhtonManager::Scheduler::initiateJoinNowDiscover(uint64_t entering_node_index) {
+void MinhtonManager::Scheduler::initiateJoinNowDiscover(uint32_t entering_node_index) {
   auto entering_app =
       manager_.nodes_.Get(entering_node_index)->GetApplication(0)->GetObject<MinhtonApplication>();
 
@@ -201,8 +201,8 @@ void MinhtonManager::Scheduler::initiateJoinNowDiscover(uint64_t entering_node_i
   initiatePeerDiscoverEnvironmentAfterJoin(entering_app);
 }
 
-void MinhtonManager::Scheduler::initiateJoinNow(uint64_t node_to_join_to_index,
-                                                uint64_t entering_node_index) {
+void MinhtonManager::Scheduler::initiateJoinNow(uint32_t node_to_join_to_index,
+                                                uint32_t entering_node_index) {
   auto app_to_join_to = manager_.nodes_.Get(node_to_join_to_index)
                             ->GetApplication(0)
                             ->GetObject<MinhtonApplication>();
@@ -219,7 +219,7 @@ void MinhtonManager::Scheduler::executeOneLeaveByPosition(uint32_t level, uint32
   std::cout << "\texecuteOneLeaveByPosition on (" << level << ":" << number << ") at "
             << Simulator::Now().GetMilliSeconds() << std::endl;
 
-  for (uint64_t leave_index = 0; leave_index < manager_.nodes_.GetN(); leave_index++) {
+  for (uint32_t leave_index = 0; leave_index < manager_.nodes_.GetN(); leave_index++) {
     auto app = manager_.nodes_.Get(leave_index)->GetApplication(0)->GetObject<MinhtonApplication>();
 
     if (app->getNodeInfo().getLevel() == level && app->getNodeInfo().getNumber() == number &&

diff --git a/daisi/src/solanet-ns3/sola_message_ns3.cpp b/daisi/src/solanet-ns3/sola_message_ns3.cpp
@@ -44,7 +44,7 @@ void SolaMessageNs3::Serialize(Buffer::Iterator start) const {
   stream << ip_ << ";";
   stream << port_ << ";";
   stream << payload_ << ";";
-  start.Write((uint8_t *)stream.str().c_str(), stream.str().size());
+  start.Write((const uint8_t *)stream.str().c_str(), stream.str().size());
 }
 
 uint32_t SolaMessageNs3::Deserialize(Buffer::Iterator start) {

diff --git a/daisi/tests/unittests/network_tcp/framing_manager_test.cpp b/daisi/tests/unittests/network_tcp/framing_manager_test.cpp
@@ -33,7 +33,7 @@ TEST_CASE("Frame message", "[frame_message]") {
   REQUIRE(framed.substr(4) == a);
 
   const std::string prefix = framed.substr(0, 4);
-  uint32_t *x = (uint32_t *)(prefix.data());
+  const uint32_t *x = (const uint32_t *)(prefix.data());
   REQUIRE(*x == htonl(6));
 }
 
@@ -45,7 +45,7 @@ TEST_CASE("Frame empty message", "[frame_empty_message]") {
   REQUIRE(framed.size() == 4);
 
   const std::string prefix = framed.substr(0);
-  uint32_t *x = (uint32_t *)(prefix.data());
+  const uint32_t *x = (const uint32_t *)(prefix.data());
   REQUIRE(*x == htonl(0));
 }