Change get_content() of ExternalEvent class to data() and change get_content() of Value class to operator().

src/artis-star/common/ExternalEvent.hpp

@@ -49,19 +49,19 @@ template < class Time >
 class ExternalEvent
 {
 public:
-    ExternalEvent(const std::string& port_name, const Value& content) :
-        _port_name(port_name), _model(nullptr), _content(content)
+    ExternalEvent(const std::string& port_name, const Value& data) :
+        _port_name(port_name), _model(nullptr), _data(data)
     { }
 
-    ExternalEvent(const Node < Time >& node, const Value& content) :
+    ExternalEvent(const Node < Time >& node, const Value& data) :
         _port_name(node.get_port_name()),
         _model(node.get_model()),
-        _content(content)
+        _data(data)
     { }
 
     ExternalEvent(const ExternalEvent& event) :
         _port_name(event._port_name), _model(event._model),
-        _content(event._content)
+        _data(event._data)
     { }
 
     ExternalEvent() : _model(nullptr)
@@ -70,14 +70,14 @@ public:
     virtual ~ExternalEvent()
     { }
 
-    const Value& get_content() const
-    { return _content; }
+    const Value& data() const
+    { return _data; }
 
     const std::string& get_port_name() const
     { return _port_name; }
 
-    void set_content(const Value& content)
-    { _content = content; }
+    void data(const Value& data)
+    { _data = data; }
 
     Model < Time >* get_model() const
     { return _model; }
@@ -95,8 +95,8 @@ public:
         ss << "( " << _port_name << " , "
            << (_model ? _model->get_name() : "<>")
            << " , ";
-        if (not _content.empty()) {
-            ss << _content.to_string();
+        if (not _data.empty()) {
+            ss << _data.to_string();
         } else {
             ss << "null";
         }
@@ -115,13 +115,13 @@ private:
         ar & _port_name;
         _model = 0;
         // ar & _model;
-        ar & _content;
+        ar & _data;
         // ar & _model->get_name();
     }
 
     std::string     _port_name;
     Model < Time >* _model;
-    Value           _content;
+    Value           _data;
 };
 
 } } // namespace artis common

src/artis-star/common/Value.hpp

@@ -72,7 +72,7 @@ public:
     { return _content == nullptr; }
 
     template < typename T >
-    void get_content(T& value) const
+    void operator()(T& value) const
     {
         assert(_type_id == typeid(T).hash_code());
 
@@ -103,32 +103,32 @@ public:
         if (is_type < double >()) {
             double v;
 
-            get_content(v);
+            operator()(v);
             return std::to_string(v);
         } else if (is_type < int >()) {
             int v;
 
-            get_content(v);
+            operator()(v);
             return std::to_string(v);
         } else if (is_type < bool >()) {
             bool v;
 
-            get_content(v);
+            operator()(v);
             return v ? "true" : "false";
         } if (is_type < std::vector < double > >()) {
             std::vector < double > v;
 
-            get_content(v);
+            operator()(v);
             return "";
         } else if (is_type < std::vector < int > >()) {
             std::vector < int > v;
 
-            get_content(v);
+            operator()(v);
             return "";
         } else if (is_type < std::vector < bool > >()) {
             std::vector < bool > v;
 
-            get_content(v);
+            operator()(v);
             return "";
         } else {
             return "<unstringify>";

src/artis-star/kernel/dtss/GraphManager.hpp

@@ -85,14 +85,14 @@ public:
 
                     ymessages.push_back(
                         common::ExternalEvent < Time >(
-                            it->second, ymsg.get_content()));
+                            it->second, ymsg.data()));
                     dynamic_cast < common::Coordinator <Time >* >(
                         _coordinator->get_parent())
                         ->dispatch_events(ymessages, t);
                 } else { // event on input port of internal model
                     it->second.get_model()->post_event(
                         t, common::ExternalEvent < Time >(
-                            it->second, ymsg.get_content()));
+                            it->second, ymsg.data()));
                 }
             }
         }
@@ -108,7 +108,7 @@ public:
                  result.first; it_r != result.second; ++it_r) {
             it_r->second.get_model()->post_event(
                 t, common::ExternalEvent < Time >(it_r->second,
-                                         event.get_content()));
+                                         event.data()));
         }
     }
 

src/artis-star/kernel/pdevs/GraphManager.hpp

@@ -86,12 +86,12 @@ public:
                 // event on output port of coupled Model
                 if (it->second.get_model() ==
                     common::GraphManager < Time >::_coordinator) {
-                    dispatch_events_to_parent(it->second, ymsg.get_content(),
+                    dispatch_events_to_parent(it->second, ymsg.data(),
                                               t);
                 } else { // event on input port of internal model
                     it->second.get_model()->post_event(
                         t, common::ExternalEvent < Time >(
-                            it->second, ymsg.get_content()));
+                            it->second, ymsg.data()));
                 }
             }
         }
@@ -131,7 +131,7 @@ public:
                  result.first; it_r != result.second; ++it_r) {
                  it_r->second.get_model()->post_event(
                      t, common::ExternalEvent < Time >(it_r->second,
-                                                       event.get_content()));
+                                                       event.data()));
         }
     }
 

src/artis-star/kernel/sss/GraphManager.hpp

@@ -87,7 +87,7 @@ public:
                     ymessages.push_back(
                         common::ExternalEvent < Time >(
                                                     it->second,
-                                                    ymsg.get_content()));
+                                                    ymsg.data()));
                     dynamic_cast < common::Coordinator <
                         Time >* >(_coordinator->get_parent())
                         ->dispatch_events(ymessages, t);
@@ -95,7 +95,7 @@ public:
                     it->second.get_model()->post_event(
                         t, common::ExternalEvent < Time >(
                                                        it->second,
-                                                       ymsg.get_content()));
+                                                       ymsg.data()));
                 }
             }
         }
@@ -111,7 +111,7 @@ public:
                  result.first; it_r != result.second; ++it_r) {
             it_r->second.get_model()->post_event(
                 t, common::ExternalEvent < Time >(it_r->second,
-                                         event.get_content()));
+                                         event.data()));
         }
     }