From 9a06daaae72b16920133b45551057b2c67bf4b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Gonz=C3=A1lez=20Santamarta?= Date: Thu, 3 Oct 2024 13:54:05 +0200 Subject: [PATCH] new version 2.4.2 --- yasmin/include/yasmin/blackboard/blackboard.hpp | 5 +++-- yasmin/package.xml | 2 +- yasmin/src/yasmin/state.cpp | 2 +- yasmin/src/yasmin/state_machine.cpp | 7 ++++--- yasmin_demos/package.xml | 2 +- yasmin_msgs/package.xml | 2 +- yasmin_ros/package.xml | 2 +- yasmin_viewer/package.xml | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/yasmin/include/yasmin/blackboard/blackboard.hpp b/yasmin/include/yasmin/blackboard/blackboard.hpp index 26dd0bb..eb128f9 100644 --- a/yasmin/include/yasmin/blackboard/blackboard.hpp +++ b/yasmin/include/yasmin/blackboard/blackboard.hpp @@ -16,10 +16,10 @@ #ifndef YASMIN_BLACKBOARD_HPP #define YASMIN_BLACKBOARD_HPP +#include #include #include #include -#include #include "yasmin/blackboard/blackboard_value.hpp" #include "yasmin/blackboard/blackboard_value_interface.hpp" @@ -43,7 +43,8 @@ class Blackboard { std::lock_guard lk(this->mutex); if (!this->contains(name)) { - throw std::runtime_error("Element " + name + " does not exist in the blackboard"); + throw std::runtime_error("Element " + name + + " does not exist in the blackboard"); } BlackboardValue *b_value = (BlackboardValue *)this->values.at(name); diff --git a/yasmin/package.xml b/yasmin/package.xml index 14112cc..2977a34 100644 --- a/yasmin/package.xml +++ b/yasmin/package.xml @@ -2,7 +2,7 @@ yasmin - 2.3.1 + 2.4.2 YASMIN (Yet Another State MachINe) main package Miguel Ángel González Santamarta GPL-3 diff --git a/yasmin/src/yasmin/state.cpp b/yasmin/src/yasmin/state.cpp index 65d8715..b39a234 100644 --- a/yasmin/src/yasmin/state.cpp +++ b/yasmin/src/yasmin/state.cpp @@ -14,9 +14,9 @@ // along with this program. If not, see . #include +#include #include #include -#include #include "yasmin/state.hpp" diff --git a/yasmin/src/yasmin/state_machine.cpp b/yasmin/src/yasmin/state_machine.cpp index d50d696..ec1ef7c 100644 --- a/yasmin/src/yasmin/state_machine.cpp +++ b/yasmin/src/yasmin/state_machine.cpp @@ -14,10 +14,10 @@ // along with this program. If not, see . #include +#include #include #include #include -#include #include #include @@ -101,8 +101,9 @@ StateMachine::execute(std::shared_ptr blackboard) { // check outcome belongs to state if (std::find(state->get_outcomes().begin(), state->get_outcomes().end(), outcome) == this->outcomes.end()) { - throw std::logic_error("Outcome (" + outcome + ") is not register in state " + - this->current_state); + throw std::logic_error("Outcome (" + outcome + + ") is not register in state " + + this->current_state); } // translate outcome using transitions diff --git a/yasmin_demos/package.xml b/yasmin_demos/package.xml index 046c48a..4687331 100644 --- a/yasmin_demos/package.xml +++ b/yasmin_demos/package.xml @@ -2,7 +2,7 @@ yasmin_demos - 2.3.1 + 2.4.2 Demos of YASMIN (Yet Another State MachINe) Miguel Ángel González Santamarta GPL-3 diff --git a/yasmin_msgs/package.xml b/yasmin_msgs/package.xml index 822ebea..505869c 100644 --- a/yasmin_msgs/package.xml +++ b/yasmin_msgs/package.xml @@ -2,7 +2,7 @@ yasmin_msgs - 2.3.1 + 2.4.2 Msgs of (Yet Another State MachINe) Miguel Ángel González Santamarta GPL-3 diff --git a/yasmin_ros/package.xml b/yasmin_ros/package.xml index f43c579..0b04428 100644 --- a/yasmin_ros/package.xml +++ b/yasmin_ros/package.xml @@ -2,7 +2,7 @@ yasmin_ros - 2.3.1 + 2.4.2 YASMIN (Yet Another State MachINe) for ROS 2 Miguel Ángel González Santamarta GPL-3 diff --git a/yasmin_viewer/package.xml b/yasmin_viewer/package.xml index a95454d..9595b02 100644 --- a/yasmin_viewer/package.xml +++ b/yasmin_viewer/package.xml @@ -2,7 +2,7 @@ yasmin_viewer - 2.3.1 + 2.4.2 TODO: Package description miguel TODO: License declaration