diff --git a/source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.cpp b/source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.cpp index 40471a632c66708ecb8085ea63a65acf6013d5a2..b37a88381383b41ea6c3ca9bd3075a50e8b733ef 100644 --- a/source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.cpp +++ b/source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.cpp @@ -24,7 +24,7 @@ namespace armarx SensorHeader fromAron(const arondto::SensorHeader& aronSensorHeader) { - + return {.agent = aronSensorHeader.agent, .frame = aronSensorHeader.frame, .timestamp = timeFromAron(aronSensorHeader.timestamp)}; diff --git a/source/RobotAPI/libraries/aron/converter/common/Converter.h b/source/RobotAPI/libraries/aron/converter/common/Converter.h index 570344ab618f8a353327a716aaa9ba5f850eaca8..f6e9959dfba18891807fad9579580375bf53382d 100644 --- a/source/RobotAPI/libraries/aron/converter/common/Converter.h +++ b/source/RobotAPI/libraries/aron/converter/common/Converter.h @@ -33,12 +33,12 @@ namespace armarx::aron * You have to provide a converter function for the element with the signature * * PlainCppType fromAron(const AronType&) - * + * * @tparam T the aron vector element * @param v the vector of elements * @return the vector of aron elements */ - template <typename T> + template <typename T> auto fromAron(const std::vector<T>& v) -> std::vector<decltype(fromAron(T()))> { std::vector<decltype(fromAron(T()))> r; diff --git a/source/RobotAPI/libraries/aron/converter/common/VectorConverter.h b/source/RobotAPI/libraries/aron/converter/common/VectorConverter.h index 17475a3b9df0f39ee10e82443f24e5251db63c58..9eaaa7c6e79174badf7f0e4e035693660f145564 100644 --- a/source/RobotAPI/libraries/aron/converter/common/VectorConverter.h +++ b/source/RobotAPI/libraries/aron/converter/common/VectorConverter.h @@ -39,7 +39,7 @@ namespace armarx::aron::converter { public: AronVectorConverter() = delete; - + template<typename T> static std::vector<T> ConvertToVector(const datanavigator::NDArrayNavigatorPtr& nav) { @@ -47,16 +47,16 @@ namespace armarx::aron::converter const auto& dims = nav->getDimensions(); - if(dims.size() != 2) + if (dims.size() != 2) { throw error::AronException("AronVectorConverter", "ConvertToVector", "The NDArray must have two dimensions.", nav->getPath()); } - - if(dims.at(1) != sizeof(T)) + + if (dims.at(1) != sizeof(T)) { throw error::AronException("AronVectorConverter", "ConvertToVector", "Dimension 1 of the array has to match the element size.", nav->getPath()); } - + const int size = std::accumulate(std::begin(dims), std::end(dims), 1, std::multiplies<>()); std::vector<T> v(dims.at(0));