|
@@ -152,7 +152,7 @@ namespace artis {
|
|
|
common::Trace<Time>::trace()
|
|
|
<< common::TraceElement<Time>(type::get_name(), t,
|
|
|
common::FormalismType::PDEVS,
|
|
|
- common::FunctionType::S_MESSAGE,
|
|
|
+ common::FunctionType::OUTPUT,
|
|
|
common::LevelType::FORMALISM)
|
|
|
<< ": BEFORE => " << "tl = " << type::_tl << " ; tn = "
|
|
|
<< type::_tn << " ; scheduler = " << _event_table.to_string();
|
|
@@ -167,7 +167,7 @@ namespace artis {
|
|
|
common::Trace<Time>::trace()
|
|
|
<< common::TraceElement<Time>(type::get_name(), t,
|
|
|
common::FormalismType::PDEVS,
|
|
|
- common::FunctionType::S_MESSAGE,
|
|
|
+ common::FunctionType::OUTPUT,
|
|
|
common::LevelType::FORMALISM)
|
|
|
<< ": IMM = " << IMM.to_string();
|
|
|
common::Trace<Time>::trace().flush();
|
|
@@ -181,7 +181,7 @@ namespace artis {
|
|
|
common::Trace<Time>::trace()
|
|
|
<< common::TraceElement<Time>(type::get_name(), t,
|
|
|
common::FormalismType::PDEVS,
|
|
|
- common::FunctionType::S_MESSAGE,
|
|
|
+ common::FunctionType::OUTPUT,
|
|
|
common::LevelType::FORMALISM)
|
|
|
<< ": AFTER => " << "tl = " << type::_tl << " ; tn = "
|
|
|
<< type::_tn << " ; scheduler = " << _event_table.to_string();
|
|
@@ -235,12 +235,11 @@ namespace artis {
|
|
|
_event_table.put(model->transition(t), model);
|
|
|
}
|
|
|
for (auto& model : IMM) {
|
|
|
- if (std::find(receivers.begin(), receivers.end(),
|
|
|
- model) == receivers.end()) {
|
|
|
+ if (std::find(receivers.begin(), receivers.end(), model) == receivers.end()) {
|
|
|
_event_table.put(model->transition(t), model);
|
|
|
}
|
|
|
}
|
|
|
- update_event_table(t);
|
|
|
+// update_event_table(t);
|
|
|
type::_tl = t;
|
|
|
type::_tn = _event_table.get_current_time();
|
|
|
type::clear_bag();
|
|
@@ -259,8 +258,7 @@ namespace artis {
|
|
|
return type::_tn;
|
|
|
}
|
|
|
|
|
|
- void post_event(const typename Time::type& t,
|
|
|
- const common::ExternalEvent<Time>& event)
|
|
|
+ void post_event(const typename Time::type& t, const common::ExternalEvent<Time>& event)
|
|
|
{
|
|
|
|
|
|
#ifdef WITH_TRACE
|
|
@@ -275,7 +273,7 @@ namespace artis {
|
|
|
|
|
|
type::add_event(event);
|
|
|
_graph_manager.post_event(t, event);
|
|
|
- update_event_table(t);
|
|
|
+// update_event_table(t);
|
|
|
type::_tn = _event_table.get_current_time();
|
|
|
|
|
|
#ifdef WITH_TRACE
|
|
@@ -307,7 +305,7 @@ namespace artis {
|
|
|
#endif
|
|
|
|
|
|
_graph_manager.dispatch_events(bag, t);
|
|
|
- update_event_table(t);
|
|
|
+// update_event_table(t);
|
|
|
type::_tn = _event_table.get_current_time();
|
|
|
|
|
|
#ifdef WITH_TRACE
|