Skip to content

Made value type of the messages a template parameter #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Made value type of the messages a template parameter #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b0a8ab
Now port value types can be specified, before it only allowed int
juanlanuzag Feb 5, 2019
988e55f
Added default type int for value types, to make it retrocompatible
juanlanuzag Feb 5, 2019
64d3ee3
Removed unused template parameter FEL
juanlanuzag Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/boost/simulation/convenience.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ std::shared_ptr<pdevs::atomic<typename MODEL::time_type, typename MODEL::message

//create a shared pointer to a hardware port
template<class MODEL, typename... Args>
std::shared_ptr<pdevs::port<typename MODEL::time_type, typename MODEL::message_type>> make_port_ptr(Args... args) noexcept {
std::shared_ptr<pdevs::port<typename MODEL::time_type, typename MODEL::message_type, typename MODEL::value_type>> make_port_ptr(Args... args) noexcept {
return std::make_shared<MODEL>(std::forward<Args>(args)...);
}

Expand Down
20 changes: 10 additions & 10 deletions include/boost/simulation/pdevs/driver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace pdevs {
/**
* @brief The coupled class represents PDEVS coupled models
*/
template<class TIME, class MSG>
template<class TIME, class MSG, class VALUE=int>
class driver
{
protected:
Expand All @@ -49,23 +49,23 @@ class driver
int numberInputPorts;
std::vector<TIME> previousEventTime;
struct topports_description{
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> input_ports; //port to model
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> output_ports; // model to port
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> input_ports; //port to model
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> output_ports; // model to port
};

topports_description _ports_desc;
public:
using time_type=TIME;
using message_type=MSG;
using description_type=topports_description;
using Value=int;
using value_type=VALUE;


/**
* @brief driver receives the whole port structure by pointers to ports
*/
driver( std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> ip,
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> op
driver( std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> ip,
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> op
) noexcept
{
_ports_desc.input_ports = ip;
Expand All @@ -84,14 +84,14 @@ class driver
}

bool get_hardware_event(MSG& input_message){
Value portValue;
value_type portValue;
std::shared_ptr<model<TIME>> to_model;
std::shared_ptr<port<TIME,MSG>> current_port;
std::shared_ptr<port<TIME,MSG,VALUE>> current_port;


bool foundEvent = false;
for (auto& ip : _ports_desc.input_ports){
current_port = std::dynamic_pointer_cast<port<TIME, MSG>>(ip.first);
current_port = std::dynamic_pointer_cast<port<TIME,MSG,VALUE>>(ip.first);

int portIndex = &ip - &_ports_desc.input_ports[0]; // pos contains the position in the vector

Expand Down Expand Up @@ -127,7 +127,7 @@ class driver
// SWO_PrintString("DRIVER: OUTPUT MESSAGE \n");
output_message.print();

Value portValue = output_message.val;
value_type portValue = output_message.val;
for(auto& op : _ports_desc.output_ports){
if(op.first->asString() == port_name){
op.first->pDriver(portValue);
Expand Down
18 changes: 9 additions & 9 deletions include/boost/simulation/pdevs/erunner.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ namespace pdevs {
* conditions, the ending conditions and the loggers, then it runs the simulation and
* displays the results.
*/
template <class TIME, class MSG, template<class, class> class FEL=nullqueue>
template <class TIME, class MSG, class VALUE=int>
class erunner
{
TIME _next; //next scheduled event
std::shared_ptr<coordinator<TIME, MSG, nullqueue>> _coordinator; //ecoordinator of the top level coupled model.
std::shared_ptr<driver<TIME, MSG>> _driver; // global driver to manage top ports connected to hardware
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> _input_ports;
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> _output_ports;
std::shared_ptr<driver<TIME, MSG, VALUE>> _driver; // global driver to manage top ports connected to hardware
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> _input_ports;
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> _output_ports;
bool _silent;

void process_output(TIME t, std::vector<MSG>& m) noexcept {
Expand Down Expand Up @@ -85,12 +85,12 @@ class erunner
*/

explicit erunner(std::shared_ptr<coupled<TIME, MSG>> cm,
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> ip,
std::vector<std::pair<std::shared_ptr<port<TIME,MSG>>, std::shared_ptr<model<TIME>>>> op) noexcept
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> ip,
std::vector<std::pair<std::shared_ptr<port<TIME,MSG,VALUE>>, std::shared_ptr<model<TIME>>>> op) noexcept
: _input_ports(ip), _output_ports(op),infinity(cm->infinity)
{
for ( auto& inpport : ip){
std::shared_ptr<port<TIME, MSG>> in_p = std::dynamic_pointer_cast<port<TIME, MSG>>(inpport.first);
std::shared_ptr<port<TIME, MSG, VALUE>> in_p = std::dynamic_pointer_cast<port<TIME, MSG, VALUE>>(inpport.first);
if ( in_p == nullptr){ //no input port provided
printf("NULL PTR TO INPUT PORT \n");
}
Expand All @@ -99,15 +99,15 @@ class erunner
}

for ( auto& outpport : op){
std::shared_ptr<port<TIME, MSG>> out_p = std::dynamic_pointer_cast<port<TIME, MSG>>(outpport.first);
std::shared_ptr<port<TIME, MSG, VALUE>> out_p = std::dynamic_pointer_cast<port<TIME, MSG, VALUE>>(outpport.first);
if ( out_p == nullptr){ //no output port provided
printf("NULL PTR TO OUTPUT PORT \n");
}
else
out_p->print();
}
_coordinator.reset(new coordinator<TIME, MSG, nullqueue>{cm});
_driver.reset(new driver<TIME,MSG>{ip,op});
_driver.reset(new driver<TIME,MSG, VALUE>{ip,op});
_next = _coordinator->init(TIME(00,00,00,010)); //TIME::currentTime()
_silent = false;
}
Expand Down
8 changes: 4 additions & 4 deletions include/boost/simulation/pdevs/port.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@ namespace pdevs {
* during execution.
*/

template <class TIME, class MSG>
template <class TIME, class MSG, class VALUE=int>
class port : public model<TIME>
{
public:
using time_type=TIME;
using message_type=MSG; //Message suggested for embedded execution is eMessage
using model_type=port<TIME, MSG>;
using Value=int;
using model_type=port<TIME, MSG, VALUE>;
using value_type=VALUE;

port(const std::string &name) noexcept :portName( name ), pollingPeriod( TIME(0) ) {}
port(const std::string &name, const TIME &pollingP) noexcept :portName( name ), pollingPeriod( pollingP ) {}
virtual ~port(){}
/**
* @brief pDriver converts received signals into hardware commands or vice-versa - To be implemented by the user
*/
virtual bool pDriver(Value&) const noexcept = 0;
virtual bool pDriver(value_type&) const noexcept = 0;
/**
* @brief asString returns the name of the port
*/
Expand Down