From a469881909d3f22478d11695d6902fde17d36ade Mon Sep 17 00:00:00 2001
From: krebs <franziska.krebs@kit.edu>
Date: Tue, 13 Aug 2024 16:35:27 +0200
Subject: [PATCH] fix fullfills type method when used in combination with
dynamic sized ndarrays
---
.../libraries/aron/core/data/variant/complex/NDArray.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp b/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
index dfad132e5..38de3e292 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
@@ -217,8 +217,9 @@ namespace armarx::aron::data
{
auto casted = type::Matrix::DynamicCastAndCheck(type);
ARMARX_TRACE;
- return (aron->shape.size() == 3 && aron->shape[0] == casted->getRows() &&
- aron->shape[1] == casted->getCols());
+ return (aron->shape.size() == 3 &&
+ (aron->shape[0] == casted->getRows() || casted->getRows() == -1) &&
+ (aron->shape[1] == casted->getCols() || casted->getCols() == -1));
}
case type::Descriptor::QUATERNION:
{
--
GitLab