#2201: reduce code duplication

Author: cz4rs

src/vt/vrt/collection/balance/lb_data_holder.cc

@@ -252,9 +252,7 @@ std::unique_ptr<nlohmann::json> LBDataHolder::toJson(PhaseType phase) const {
 
   i = 0;
   if (node_comm_.find(phase) != node_comm_.end()) {
-    for (auto&& elm : node_comm_.at(phase)) {
-      auto volume = elm.second;
-      auto const& key = elm.first;
+    for (auto const& [key, volume] : node_comm_.at(phase)) {
       j["communications"][i]["bytes"] = volume.bytes;
       j["communications"][i]["messages"] = volume.messages;
 
@@ -296,16 +294,11 @@ std::unique_ptr<nlohmann::json> LBDataHolder::toJson(PhaseType phase) const {
         outputEntity(j["communications"][i]["from"], key.fromObj());
         break;
       }
-      case elm::CommCategory::ReadOnlyShared: {
-        j["communications"][i]["type"] = "ReadOnlyShared";
-        j["communications"][i]["to"]["type"] = "node";
-        j["communications"][i]["to"]["id"] = key.toNode();
-        j["communications"][i]["from"]["type"] = "shared_id";
-        j["communications"][i]["from"]["id"] = key.sharedID();
-        break;
-      }
+      case elm::CommCategory::ReadOnlyShared:
       case elm::CommCategory::WriteShared: {
-        j["communications"][i]["type"] = "WriteShared";
+        j["communications"][i]["type"] =
+          (key.cat_ == elm::CommCategory::ReadOnlyShared) ?
+          "ReadOnlyShared" : "WriteShared";
         j["communications"][i]["to"]["type"] = "node";
         j["communications"][i]["to"]["id"] = key.toNode();
         j["communications"][i]["from"]["type"] = "shared_id";

src/vt/vrt/collection/balance/lb_data_holder.h

@@ -46,12 +46,9 @@
 
 #include "vt/config.h"
 #include "vt/vrt/collection/balance/lb_common.h"
-#include "vt/elm/elm_comm.h"
 
 #include <unordered_map>
 #include <memory>
-#include <variant>
-#include <string>
 
 #include <nlohmann/json_fwd.hpp>
 

src/vt/vrt/collection/balance/model/load_model.h

@@ -222,9 +222,7 @@ struct LoadModel
    *
    * \return the comm info
    */
-  virtual CommMapType getComm([[maybe_unused]] PhaseOffset when) const {
-    return CommMapType{};
-  }
+  virtual CommMapType getComm(PhaseOffset when) const = 0;
 
   /**
    * \brief Provide an estimate of the given object's load during a specified interval

src/vt/vrt/collection/balance/node_lb_data.cc

@@ -272,7 +272,6 @@ getRecvSendDirection(elm::CommKeyType const& comm) {
   // this case is just to avoid warning of not handled enum
   case elm::CommCategory::CollectiveToCollectionBcast:
   case elm::CommCategory::LocalInvoke:
-    return std::make_pair(ElementIDType{}, ElementIDType{});
   case elm::CommCategory::WriteShared:
   case elm::CommCategory::ReadOnlyShared:
     return std::make_pair(ElementIDType{}, ElementIDType{});