From 3d6d7a0380dc0bb598ae0ff58481692423474f1c Mon Sep 17 00:00:00 2001 From: fpasch <46815108+fpasch@users.noreply.github.com> Date: Fri, 9 Oct 2020 14:26:17 +0200 Subject: [PATCH] Fix unstructured vehicle curvature (#86) * Update unstructured constellation polygon creation Fix vehicle curvature calculation after response time, make DebugDrawing accessible from python * Update version to 4.3.0 * Cleanup Change-Id: I2b185f59b8545d150e8049534d2eeb0dbdc447b5 * Cleanup unit tests Change-Id: I910c03f1d0aaa259a5c1d45529b9927386e0b8ca --- ad_rss/generated/CMakeLists.txt | 2 +- .../ad/rss/world/UnstructuredSettings.hpp | 10 - ad_rss/generated/include/ad_rss/Version.hpp | 4 +- .../ad/rss/unstructured/DebugDrawing.hpp | 71 +++++- .../src/unstructured/TrajectoryCommon.hpp | 6 - .../src/unstructured/TrajectoryPedestrian.cpp | 69 +++--- .../src/unstructured/TrajectoryVehicle.cpp | 221 ++++++------------ .../src/unstructured/TrajectoryVehicle.hpp | 12 +- .../rss/situation/SituationSnapshotTests.cpp | 27 --- .../SituationSnapshotValidInputRangeTests.cpp | 42 ---- .../ad/rss/situation/SituationTests.cpp | 16 -- .../SituationValidInputRangeTests.cpp | 72 ------ .../SituationVectorValidInputRangeTests.cpp | 24 -- .../ad/rss/situation/VehicleStateTests.cpp | 8 - .../VehicleStateValidInputRangeTests.cpp | 52 ----- .../ad/rss/state/RssStateSnapshotTests.cpp | 8 - .../RssStateSnapshotValidInputRangeTests.cpp | 12 - .../ad/rss/world/RssDynamicsTests.cpp | 7 - .../world/RssDynamicsValidInputRangeTests.cpp | 52 ----- .../generated/ad/rss/world/SceneTests.cpp | 16 -- .../rss/world/SceneValidInputRangeTests.cpp | 88 ------- .../world/SceneVectorValidInputRangeTests.cpp | 24 -- .../rss/world/UnstructuredSettingsTests.cpp | 13 -- ...structuredSettingsValidInputRangeTests.cpp | 22 -- .../ad/rss/world/WorldModelTests.cpp | 25 -- .../world/WorldModelValidInputRangeTests.cpp | 36 --- ad_rss/python/generate_python_lib.py.in | 8 +- doc/CHANGELOG.md | 6 + doc/ad_rss/UnstructuredConstellations.md | 5 +- 29 files changed, 181 insertions(+), 777 deletions(-) diff --git a/ad_rss/generated/CMakeLists.txt b/ad_rss/generated/CMakeLists.txt index d582bf7d22..31118d04fa 100644 --- a/ad_rss/generated/CMakeLists.txt +++ b/ad_rss/generated/CMakeLists.txt @@ -14,7 +14,7 @@ ## cmake_minimum_required(VERSION 3.5) -project(ad_rss VERSION 4.2.0) +project(ad_rss VERSION 4.3.0) include(GNUInstallDirs) include(CMakePackageConfigHelpers) diff --git a/ad_rss/generated/include/ad/rss/world/UnstructuredSettings.hpp b/ad_rss/generated/include/ad/rss/world/UnstructuredSettings.hpp index d0272d390f..ca923c91d3 100644 --- a/ad_rss/generated/include/ad/rss/world/UnstructuredSettings.hpp +++ b/ad_rss/generated/include/ad/rss/world/UnstructuredSettings.hpp @@ -108,7 +108,6 @@ struct UnstructuredSettings && (vehicleTrajectoryCalculationStep == other.vehicleTrajectoryCalculationStep) && (vehicleFrontIntermediateRatioSteps == other.vehicleFrontIntermediateRatioSteps) && (vehicleBackIntermediateRatioSteps == other.vehicleBackIntermediateRatioSteps) - && (vehicleResponseTimeIntermediateAccelerationSteps == other.vehicleResponseTimeIntermediateAccelerationSteps) && (vehicleBrakeIntermediateAccelerationSteps == other.vehicleBrakeIntermediateAccelerationSteps) && (vehicleContinueForwardIntermediateAccelerationSteps == other.vehicleContinueForwardIntermediateAccelerationSteps); @@ -175,12 +174,6 @@ struct UnstructuredSettings */ uint32_t vehicleBackIntermediateRatioSteps{0}; - /*! - * Specifies the intermediate acceleration steps (between brakeMax and accelMax) used while calculating the states at - * response time. These are later used for calculating the trajectory sets. - */ - uint32_t vehicleResponseTimeIntermediateAccelerationSteps{0}; - /*! * Specifies the intermediate acceleration steps (between brakeMax and brakeMin) used while calculating the cbrake * trajectory set. This is applied to all vehicleResponseIntermediateAccelerationSteps, therefore it has only an @@ -251,9 +244,6 @@ inline std::ostream &operator<<(std::ostream &os, UnstructuredSettings const &_v os << "vehicleBackIntermediateRatioSteps:"; os << _value.vehicleBackIntermediateRatioSteps; os << ","; - os << "vehicleResponseTimeIntermediateAccelerationSteps:"; - os << _value.vehicleResponseTimeIntermediateAccelerationSteps; - os << ","; os << "vehicleBrakeIntermediateAccelerationSteps:"; os << _value.vehicleBrakeIntermediateAccelerationSteps; os << ","; diff --git a/ad_rss/generated/include/ad_rss/Version.hpp b/ad_rss/generated/include/ad_rss/Version.hpp index 1e6d88875b..9238faba33 100644 --- a/ad_rss/generated/include/ad_rss/Version.hpp +++ b/ad_rss/generated/include/ad_rss/Version.hpp @@ -25,7 +25,7 @@ /*! * The minor version of ad_rss */ -#define AD_RSS_VERSION_MINOR 2 +#define AD_RSS_VERSION_MINOR 3 /*! * The revision of ad_rss @@ -35,4 +35,4 @@ /*! * The version of ad_rss as string */ -#define AD_RSS_VERSION_STRING "4.2.0" +#define AD_RSS_VERSION_STRING "4.3.0" diff --git a/ad_rss/impl/include/ad/rss/unstructured/DebugDrawing.hpp b/ad_rss/impl/include/ad/rss/unstructured/DebugDrawing.hpp index 07b92f0a76..3e62372ded 100644 --- a/ad_rss/impl/include/ad/rss/unstructured/DebugDrawing.hpp +++ b/ad_rss/impl/include/ad/rss/unstructured/DebugDrawing.hpp @@ -18,6 +18,7 @@ #define DEBUG_DRAWING_POLYGON(polygon, color, ns) (DebugDrawing::getInstance()->drawPolygon(polygon, color, ns)) #define DEBUG_DRAWING_LINE(line, color, ns) (DebugDrawing::getInstance()->drawLine(line, color, ns)) +#define DEBUG_DRAWING_IS_ENABLED() (DebugDrawing::getInstance()->isEnabled()) /*! * @brief namespace ad @@ -35,6 +36,21 @@ namespace unstructured { class DebugDrawing { public: + struct NullDeleter + { + void operator()(const void *) + { + } + }; + struct DebugPoint + { + DebugPoint(double inX, double inY) + : x(inX) + , y(inY){}; + double x; + double y; + }; + struct DebugLine { DebugLine(Line const &iLine, std::string const &iColor, std::string const &iNs) @@ -46,6 +62,16 @@ class DebugDrawing Line line; std::string color{"white"}; std::string ns; + + std::vector getVector() + { + std::vector vectorLine; + for (auto const &pt : line) + { + vectorLine.push_back(DebugPoint(pt.x(), pt.y())); + } + return vectorLine; + } }; struct DebugPolygon @@ -59,6 +85,16 @@ class DebugDrawing Polygon polygon; std::string color{"white"}; std::string ns; + + std::vector getVector() + { + std::vector vectorPolygon; + for (auto const &pt : polygon.outer()) + { + vectorPolygon.push_back(DebugPoint(pt.x(), pt.y())); + } + return vectorPolygon; + } }; explicit DebugDrawing() = default; @@ -66,10 +102,10 @@ class DebugDrawing /** * @brief singelton instance getter */ - static DebugDrawing *getInstance() + static std::shared_ptr getInstance() { static DebugDrawing *mSingleton = new DebugDrawing(); - return mSingleton; + return std::shared_ptr(mSingleton, NullDeleter()); } /** @@ -77,10 +113,30 @@ class DebugDrawing */ void reset() { + if (!mEnabled) + { + return; + } mLines.clear(); mPolygons.clear(); } + /** + * @brief enable/disable debug drawing + */ + void enable(bool value) + { + mEnabled = value; + } + + /** + * @brief enable/disable debug drawing + */ + bool isEnabled() + { + return mEnabled; + } + /** * @brief draw a line * @@ -90,6 +146,10 @@ class DebugDrawing */ void drawLine(Line const &line, std::string const &color = "white", std::string const &ns = "") { + if (!mEnabled) + { + return; + } mLines.push_back(DebugLine(line, color, ns)); spdlog::trace("DRAW;{};{};{};LINE", ns, color, std::to_string(line)); @@ -104,13 +164,16 @@ class DebugDrawing */ void drawPolygon(Polygon const &polygon, std::string const &color = "white", std::string const &ns = "") { + if (!mEnabled) + { + return; + } mPolygons.push_back(DebugPolygon(polygon, color, ns)); - - spdlog::trace("DRAW;{};{};{};POLYGON", ns, color, std::to_string(polygon)); } std::vector mLines; std::vector mPolygons; + bool mEnabled{false}; }; } // namespace unstructured diff --git a/ad_rss/impl/src/unstructured/TrajectoryCommon.hpp b/ad_rss/impl/src/unstructured/TrajectoryCommon.hpp index fe6a487415..135e11dddc 100644 --- a/ad_rss/impl/src/unstructured/TrajectoryCommon.hpp +++ b/ad_rss/impl/src/unstructured/TrajectoryCommon.hpp @@ -17,12 +17,6 @@ #include "ad/rss/situation/VehicleState.hpp" #include "ad/rss/unstructured/Geometry.hpp" -#define DEBUG_DRAWING 0 - -#if DEBUG_DRAWING -#include "ad/rss/unstructured/DebugDrawing.hpp" -#endif - /*! * @brief namespace ad */ diff --git a/ad_rss/impl/src/unstructured/TrajectoryPedestrian.cpp b/ad_rss/impl/src/unstructured/TrajectoryPedestrian.cpp index 075196b22b..efde1bc77d 100644 --- a/ad_rss/impl/src/unstructured/TrajectoryPedestrian.cpp +++ b/ad_rss/impl/src/unstructured/TrajectoryPedestrian.cpp @@ -12,6 +12,7 @@ #include "TrajectoryPedestrian.hpp" #include #include "ad/rss/situation/Physics.hpp" +#include "ad/rss/unstructured/DebugDrawing.hpp" /*! * @brief namespace ad @@ -52,10 +53,8 @@ bool TrajectoryPedestrian::calculateTrajectorySets(situation::VehicleState const result = calculateTrajectorySetsMoving(vehicleState, timeToStop, brakePolygon, continueForwardPolygon); } } -#if DEBUG_DRAWING - DEBUG_DRAWING_POLYGON(brakePolygon, "red", "brake_pedestrian"); - DEBUG_DRAWING_POLYGON(continueForwardPolygon, "green", "continueForward_pedestrian"); -#endif + DEBUG_DRAWING_POLYGON(brakePolygon, "red", "pedestrian_brake"); + DEBUG_DRAWING_POLYGON(continueForwardPolygon, "green", "pedestrian_continueForward"); return result; } @@ -170,11 +169,8 @@ bool TrajectoryPedestrian::calculateTrajectorySetsMoving(situation::VehicleState //------------- if (result) { - result = calculateStepPolygon(vehicleState, - minBrakeDistance, - responseTimeFrontSide, - "", //"brake_front", - brakePolygon); + result = calculateStepPolygon( + vehicleState, minBrakeDistance, responseTimeFrontSide, "pedestrian_brake_front", brakePolygon); if (!result) { spdlog::debug("TrajectoryPedestrian::calculateTrajectorySets>> Could not calculate brake max step polygon."); @@ -216,9 +212,7 @@ bool TrajectoryPedestrian::calculateTrajectorySetsMoving(situation::VehicleState boost::geometry::append( back, getVehicleCorner(finalLeftMaxBrakeDistance, vehicleState.objectState.dimension, VehicleCorner::frontLeft)); boost::geometry::convex_hull(back, maxBrakePolygon); -#if DEBUG_DRAWING - DEBUG_DRAWING_POLYGON(maxBrakePolygon, "red", "brake_back"); -#endif + DEBUG_DRAWING_POLYGON(maxBrakePolygon, "red", "pedestrian_brake_back"); combinePolygon(maxBrakePolygon, brakePolygon, brakePolygon); } @@ -230,8 +224,11 @@ bool TrajectoryPedestrian::calculateTrajectorySetsMoving(situation::VehicleState //------------- if (result) { - result = calculateStepPolygon( - vehicleState, accelMaxDistance, responseTimeFrontSide, "continueForward_front", continueForwardPolygon); + result = calculateStepPolygon(vehicleState, + accelMaxDistance, + responseTimeFrontSide, + "pedestrian_continueForward_front", + continueForwardPolygon); if (!result) { spdlog::debug( @@ -399,21 +396,18 @@ bool TrajectoryPedestrian::calculateStepPolygon(situation::VehicleState const &v auto finalCenterFrontRight = getVehicleCorner(finalStep.center, vehicleState.objectState.dimension, VehicleCorner::frontRight); -//---- -// left -//---- -#if DEBUG_DRAWING + //---- + // left + //---- int idx = 0; -#endif for (auto it = finalStep.left.begin(); (it != finalStep.left.end()) && result; ++it) { -#if DEBUG_DRAWING - auto vehicleLocation = TrafficParticipantLocation(*it, vehicleState); - DEBUG_DRAWING_POLYGON(vehicleLocation.toPolygon(), "black", debugNamespace + "_left_" + std::to_string(idx)); + if (DEBUG_DRAWING_IS_ENABLED()) + { + auto vehicleLocation = TrafficParticipantLocation(*it, vehicleState); + DEBUG_DRAWING_POLYGON(vehicleLocation.toPolygon(), "black", debugNamespace + "_left_" + std::to_string(idx)); + } ++idx; -#else - (void)debugNamespace; -#endif boost::geometry::append(ptsLeft, getVehicleCorner(*it, vehicleState.objectState.dimension, VehicleCorner::frontRight)); boost::geometry::append(ptsLeft, @@ -422,21 +416,18 @@ bool TrajectoryPedestrian::calculateStepPolygon(situation::VehicleState const &v boost::geometry::append(ptsLeft, finalCenterFrontLeft); boost::geometry::append(ptsLeft, finalCenterFrontRight); -//----- -// right -//----- -#if DEBUG_DRAWING + //----- + // right + //----- idx = 0; -#endif for (auto it = finalStep.right.begin(); (it != finalStep.right.end()) && result; ++it) { -#if DEBUG_DRAWING - auto vehicleLocation = TrafficParticipantLocation(*it, vehicleState); - DEBUG_DRAWING_POLYGON(vehicleLocation.toPolygon(), "black", debugNamespace + "_right_" + std::to_string(idx)); + if (DEBUG_DRAWING_IS_ENABLED()) + { + auto vehicleLocation = TrafficParticipantLocation(*it, vehicleState); + DEBUG_DRAWING_POLYGON(vehicleLocation.toPolygon(), "black", debugNamespace + "_right_" + std::to_string(idx)); + } ++idx; -#else - (void)debugNamespace; -#endif boost::geometry::append(ptsRight, getVehicleCorner(*it, vehicleState.objectState.dimension, VehicleCorner::frontLeft)); boost::geometry::append(ptsRight, @@ -529,10 +520,8 @@ bool TrajectoryPedestrian::getResponseTimeTrajectoryPoint(situation::VehicleStat speed, maxDistance); -#if DEBUG_DRAWING Line linePts; boost::geometry::append(linePts, startingPoint); -#endif TrajectoryPoint currentPoint(vehicleState); @@ -564,16 +553,12 @@ bool TrajectoryPedestrian::getResponseTimeTrajectoryPoint(situation::VehicleStat pointAfterResponseTime = startingPoint + toPoint(-std::sin(startingAngle) * maxDistance, std::cos(startingAngle) * maxDistance); } -#if DEBUG_DRAWING boost::geometry::append(linePts, pointAfterResponseTime); -#endif resultTrajectoryPoint = TrajectoryPoint( pointAfterResponseTime, vehicleState.objectState.yaw + angleChange, speed, physics::AngularVelocity(0.)); -#if DEBUG_DRAWING DEBUG_DRAWING_LINE( linePts, "orange", std::to_string(aUntilResponseTime) + "_" + std::to_string(angleChangeRatio) + "_trajectory"); -#endif return result; } diff --git a/ad_rss/impl/src/unstructured/TrajectoryVehicle.cpp b/ad_rss/impl/src/unstructured/TrajectoryVehicle.cpp index 3da1b5e954..96e0cb449f 100644 --- a/ad_rss/impl/src/unstructured/TrajectoryVehicle.cpp +++ b/ad_rss/impl/src/unstructured/TrajectoryVehicle.cpp @@ -13,6 +13,7 @@ #include #include #include +#include "ad/rss/unstructured/DebugDrawing.hpp" /*! * @brief namespace ad */ @@ -40,24 +41,20 @@ bool TrajectoryVehicle::calculateTrajectorySets(situation::VehicleState const &v TrajectorySetStep responseTimeFrontSide; TrajectorySetStep responseTimeBackSide; - std::vector responseTimeTrajectorySetSteps; if (result) { - result = getResponseTimeTrajectoryPoints( - vehicleState, responseTimeTrajectorySetSteps, responseTimeFrontSide, responseTimeBackSide); + result = getResponseTimeTrajectoryPoints(vehicleState, responseTimeFrontSide, responseTimeBackSide); if (!result) { spdlog::debug("TrajectoryVehicle::calculateTrajectorySets>> Could not calculate reponse time trajectory points."); } else { - spdlog::trace( - "Trajectory points at response time: front left {}, front right {}, back left {}, back right {}, steps {}", - responseTimeFrontSide.left.size(), - responseTimeFrontSide.right.size(), - responseTimeBackSide.left.size(), - responseTimeBackSide.right.size(), - responseTimeTrajectorySetSteps.size()); + spdlog::trace("Trajectory points at response time: front left {}, front right {}, back left {}, back right {}", + responseTimeFrontSide.left.size(), + responseTimeFrontSide.right.size(), + responseTimeBackSide.left.size(), + responseTimeBackSide.right.size()); } } @@ -67,7 +64,6 @@ bool TrajectoryVehicle::calculateTrajectorySets(situation::VehicleState const &v { result = calculateBrake(vehicleState, timeAfterResponseTime, - responseTimeTrajectorySetSteps, responseTimeFrontSide, responseTimeBackSide, brakePolygon, @@ -82,7 +78,6 @@ bool TrajectoryVehicle::calculateTrajectorySets(situation::VehicleState const &v { result = calculateContinueForward(vehicleState, timeAfterResponseTime, - responseTimeTrajectorySetSteps, responseTimeFrontSide, brakePolygon, brakeMinStepVehicleLocations, @@ -96,11 +91,8 @@ bool TrajectoryVehicle::calculateTrajectorySets(situation::VehicleState const &v continueForwardPolygon = brakePolygon; } } -#if DEBUG_DRAWING - DEBUG_DRAWING_POLYGON(brakePolygon, "red", "brake"); - DEBUG_DRAWING_POLYGON(continueForwardPolygon, "green", "continueForward"); - spdlog::trace("DRAW DONE"); -#endif + DEBUG_DRAWING_POLYGON(brakePolygon, "red", "vehicle_brake"); + DEBUG_DRAWING_POLYGON(continueForwardPolygon, "green", "vehicle_continueForward"); return result; } @@ -114,7 +106,6 @@ TrajectoryVehicle::calculateYawRate(situation::VehicleState const &vehicleState, } bool TrajectoryVehicle::getResponseTimeTrajectoryPoints(situation::VehicleState const &vehicleState, - std::vector &trajectorySetSteps, TrajectorySetStep &frontSide, TrajectorySetStep &backSide) const { @@ -177,38 +168,6 @@ bool TrajectoryVehicle::getResponseTimeTrajectoryPoints(situation::VehicleState } } } - - //------------- - // sides - //------------- - auto accelStepSize = (vehicleState.dynamics.alphaLon.accelMax - vehicleState.dynamics.alphaLon.brakeMax) - / (1.0 + vehicleState.dynamics.unstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps); - for (ad::physics::Acceleration accel = vehicleState.dynamics.alphaLon.brakeMax + accelStepSize; - (accel < vehicleState.dynamics.alphaLon.accelMax) && result; - accel += accelStepSize) - { - TrajectoryPoint right; - TrajectoryPoint left; - TrajectoryPoint center; - physics::Duration timeInMovementUntilResponseTime; - result = getTimeInMovementUntilResponse(vehicleState, accel, timeInMovementUntilResponseTime); - if (result) - { - result = getResponseTimeTrajectoryPoint( - vehicleState, timeInMovementUntilResponseTime, accel, physics::RatioValue(-1.0), right); - } - if (result) - { - result = getResponseTimeTrajectoryPoint( - vehicleState, timeInMovementUntilResponseTime, accel, physics::RatioValue(1.0), left); - } - if (result) - { - result = getResponseTimeTrajectoryPoint( - vehicleState, timeInMovementUntilResponseTime, accel, physics::RatioValue(0.0), center); - } - trajectorySetSteps.push_back(TrajectorySetStep(left, right, center)); - } return result; } @@ -278,7 +237,7 @@ bool TrajectoryVehicle::getResponseTimeTrajectoryPoint(situation::VehicleState c vehicleState.dynamics.unstructuredSettings.vehicleYawRateChange, yawRateChangeRatio); - result = calculateNextTrajectoryPoint(currentPoint, aUntilResponseTime, timeStep, vehicleState.dynamics, false); + result = calculateNextTrajectoryPoint(currentPoint, aUntilResponseTime, timeStep, vehicleState.dynamics); } if (result) @@ -291,8 +250,7 @@ bool TrajectoryVehicle::getResponseTimeTrajectoryPoint(situation::VehicleState c bool TrajectoryVehicle::calculateNextTrajectoryPoint(TrajectoryPoint ¤tPoint, physics::Acceleration const &acceleration, physics::Duration const &duration, - ::ad::rss::world::RssDynamics const &dynamics, - bool afterResponseTime) const + ::ad::rss::world::RssDynamics const &dynamics) const { ad::physics::Distance currentDistance; physics::Speed finalSpeed; @@ -312,15 +270,8 @@ bool TrajectoryVehicle::calculateNextTrajectoryPoint(TrajectoryPoint ¤tPoi auto currentRadius = physics::Distance::getMax(); if (currentPoint.yawRate != physics::AngularVelocity(0.)) { - if (afterResponseTime) - { - currentRadius = physics::Distance(1.) / static_cast(currentPoint.yawRate) * static_cast(duration); - } - else - { - currentRadius - = ad::physics::Distance(static_cast(currentPoint.speed) / static_cast(currentPoint.yawRate)); - } + currentRadius + = ad::physics::Distance(static_cast(currentPoint.speed) / static_cast(currentPoint.yawRate)); } if (std::fabs(currentRadius) < dynamics.unstructuredSettings.vehicleMinRadius) @@ -347,7 +298,6 @@ bool TrajectoryVehicle::calculateNextTrajectoryPoint(TrajectoryPoint ¤tPoi bool TrajectoryVehicle::calculateBrake(situation::VehicleState const &vehicleState, ad::physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, TrajectorySetStep const &responseTimeBackSide, Polygon &resultPolygon, @@ -383,7 +333,7 @@ bool TrajectoryVehicle::calculateBrake(situation::VehicleState const &vehicleSta timeToStopBrakeMax, responseTimeBackSide, vehicleState.dynamics.alphaLon.brakeMax, - "brake_brakeMax", + "vehicle_brake_brakeMax", resultPolygon, brakeMaxVehicleLocations); if (!result) @@ -410,11 +360,10 @@ bool TrajectoryVehicle::calculateBrake(situation::VehicleState const &vehicleSta result = calculateTrajectorySetFrontAndSide(vehicleState, timeAfterResponseTime, - responseTimeTrajectorySetSteps, responseTimeFrontSide, brakeMaxVehicleLocations, accelerations, - "brake", + "vehicle_brake", resultPolygon, brakeMinStepVehicleLocation); if (!result) @@ -427,7 +376,6 @@ bool TrajectoryVehicle::calculateBrake(situation::VehicleState const &vehicleSta bool TrajectoryVehicle::calculateContinueForward(situation::VehicleState const &vehicleState, physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, Polygon const &brakePolygon, TrajectorySetStepVehicleLocation const &brakeMinStepVehicleLocation, @@ -448,11 +396,10 @@ bool TrajectoryVehicle::calculateContinueForward(situation::VehicleState const & TrajectorySetStepVehicleLocation frontSideStepVehicleLocation; // unused auto result = calculateTrajectorySetFrontAndSide(vehicleState, timeAfterResponseTime, - responseTimeTrajectorySetSteps, responseTimeFrontSide, brakeMinStepVehicleLocation, accelerations, - "continueForward", + "vehicle_continueForward", resultPolygon, frontSideStepVehicleLocation); if (!result) @@ -465,7 +412,6 @@ bool TrajectoryVehicle::calculateContinueForward(situation::VehicleState const & bool TrajectoryVehicle::calculateTrajectorySetFrontAndSide( situation::VehicleState const &vehicleState, physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, TrajectorySetStepVehicleLocation const &initialStepVehicleLocation, std::vector const &accelerations, @@ -480,72 +426,68 @@ bool TrajectoryVehicle::calculateTrajectorySetFrontAndSide( //------------- for (auto itAcceleration = accelerations.begin(); (itAcceleration != accelerations.end()) && result; ++itAcceleration) { - int idx = 0; - for (auto itStep = responseTimeTrajectorySetSteps.begin(); - (itStep != responseTimeTrajectorySetSteps.end()) && result; - ++itStep) + physics::Duration calculationTime = timeAfterResponseTime; + if (*itAcceleration < physics::Acceleration(0.)) { - physics::Duration calculationTime = timeAfterResponseTime; - if (*itAcceleration < physics::Acceleration(0.)) + if (responseTimeFrontSide.center.speed == physics::Speed(0.)) { - if (itStep->center.speed == physics::Speed(0.)) - { - calculationTime = physics::Duration(0.); - } - else - { - physics::Duration timeToStop; - result = situation::calculateTimeToStop(itStep->center.speed, - timeAfterResponseTime, - vehicleState.dynamics.maxSpeedOnAcceleration, - *itAcceleration, - *itAcceleration, - timeToStop); - calculationTime = std::min(timeToStop, timeAfterResponseTime); - } + calculationTime = physics::Duration(0.); } - - Polygon stepPolygon; - TrajectorySetStepVehicleLocation currentStepVehicleLocation; - if (result) + else { - result - = calculateStepPolygon(vehicleState, - calculationTime, - *itStep, - *itAcceleration, - debugNamespace + "_" + std::to_string(*itAcceleration) + "_" + std::to_string(idx), - stepPolygon, - currentStepVehicleLocation); - if (!result) - { - spdlog::debug("TrajectoryVehicle::calculateTrajectorySetFrontAndSide>> Could not calculate step polygon for " - "speed {}, acceleration {}, calcTime {}", - itStep->center.speed, - *itAcceleration, - calculationTime); - } + physics::Duration timeToStop; + result = situation::calculateTimeToStop(responseTimeFrontSide.center.speed, + timeAfterResponseTime, + vehicleState.dynamics.maxSpeedOnAcceleration, + *itAcceleration, + *itAcceleration, + timeToStop); + calculationTime = std::min(timeToStop, timeAfterResponseTime); } - if (result) + } + + Polygon stepPolygon; + TrajectorySetStepVehicleLocation currentStepVehicleLocation; + if (result) + { + TrajectorySetStep sideStep; + sideStep.center = responseTimeFrontSide.center; + sideStep.left.push_back(responseTimeFrontSide.left.back()); + sideStep.right.push_back(responseTimeFrontSide.right.front()); + result = calculateStepPolygon(vehicleState, + calculationTime, + sideStep, + *itAcceleration, + debugNamespace + "_" + std::to_string(*itAcceleration), + stepPolygon, + currentStepVehicleLocation); + if (!result) { - result = calculateEstimationBetweenSteps( - resultPolygon, previousStepVehicleLocation, currentStepVehicleLocation, debugNamespace + "_step_estimation"); - if (!result) - { - spdlog::debug("TrajectoryVehicle::calculateTrajectorySetFrontAndSide>> Could not calculate between steps " - "polygon. Speed {}, acceleration {}, calcTime {}", - itStep->center.speed, - *itAcceleration, - calculationTime); - } - previousStepVehicleLocation = currentStepVehicleLocation; + spdlog::debug("TrajectoryVehicle::calculateTrajectorySetFrontAndSide>> Could not calculate step polygon for " + "speed {}, acceleration {}, calcTime {}", + responseTimeFrontSide.center.speed, + *itAcceleration, + calculationTime); } - - if (result) + } + if (result) + { + result = calculateEstimationBetweenSteps( + resultPolygon, previousStepVehicleLocation, currentStepVehicleLocation, debugNamespace + "_step_estimation"); + if (!result) { - result = combinePolygon(resultPolygon, stepPolygon, resultPolygon); + spdlog::debug("TrajectoryVehicle::calculateTrajectorySetFrontAndSide>> Could not calculate between steps " + "polygon. Speed {}, acceleration {}, calcTime {}", + responseTimeFrontSide.center.speed, + *itAcceleration, + calculationTime); } - ++idx; + previousStepVehicleLocation = currentStepVehicleLocation; + } + + if (result) + { + result = combinePolygon(resultPolygon, stepPolygon, resultPolygon); } } @@ -596,14 +538,9 @@ bool TrajectoryVehicle::calculateStepPolygon(situation::VehicleState const &vehi for (auto it = step.left.begin(); (it != step.left.end()) && result; ++it) { auto currentPointLeft = *it; - result = calculateNextTrajectoryPoint( - currentPointLeft, acceleration, timeAfterResponseTime, vehicleState.dynamics, true); + result = calculateNextTrajectoryPoint(currentPointLeft, acceleration, timeAfterResponseTime, vehicleState.dynamics); auto vehicleLocationLeft = TrafficParticipantLocation(currentPointLeft, vehicleState); -#if DEBUG_DRAWING DEBUG_DRAWING_POLYGON(vehicleLocationLeft.toPolygon(), "black", debugNamespace + "_left_" + std::to_string(idx)); -#else - (void)debugNamespace; -#endif boost::geometry::append(frontPtsLeft, vehicleLocationLeft.toMultiPoint()); if (it == step.left.end() - 1) { @@ -616,12 +553,10 @@ bool TrajectoryVehicle::calculateStepPolygon(situation::VehicleState const &vehi if (result) { auto currentPointCenter = step.center; - result = calculateNextTrajectoryPoint( - currentPointCenter, acceleration, timeAfterResponseTime, vehicleState.dynamics, true); + result + = calculateNextTrajectoryPoint(currentPointCenter, acceleration, timeAfterResponseTime, vehicleState.dynamics); auto vehicleLocationCenter = TrafficParticipantLocation(currentPointCenter, vehicleState); -#if DEBUG_DRAWING DEBUG_DRAWING_POLYGON(vehicleLocationCenter.toPolygon(), "blue", debugNamespace + "_center"); -#endif boost::geometry::append(frontPtsLeft, vehicleLocationCenter.toMultiPoint()); stepVehicleLocation.center = vehicleLocationCenter; boost::geometry::append(frontPtsRight, vehicleLocationCenter.toMultiPoint()); @@ -631,12 +566,10 @@ bool TrajectoryVehicle::calculateStepPolygon(situation::VehicleState const &vehi for (auto it = step.right.begin(); (it != step.right.end()) && result; ++it) { auto currentPointRight = *it; - result = calculateNextTrajectoryPoint( - currentPointRight, acceleration, timeAfterResponseTime, vehicleState.dynamics, true); + result + = calculateNextTrajectoryPoint(currentPointRight, acceleration, timeAfterResponseTime, vehicleState.dynamics); auto vehicleLocationRight = TrafficParticipantLocation(currentPointRight, vehicleState); -#if DEBUG_DRAWING DEBUG_DRAWING_POLYGON(vehicleLocationRight.toPolygon(), "blue", debugNamespace + "_right_" + std::to_string(idx)); -#endif boost::geometry::append(frontPtsRight, vehicleLocationRight.toMultiPoint()); if (it == step.right.begin()) { @@ -707,11 +640,7 @@ bool TrajectoryVehicle::calculateEstimationBetweenSteps( if (result) { -#if DEBUG_DRAWING DEBUG_DRAWING_POLYGON(hullBack, "yellow", debugNamespace + "_hull_back"); -#else - (void)debugNamespace; -#endif result = combinePolygon(polygon, hullBack, polygon); } } @@ -762,9 +691,7 @@ bool TrajectoryVehicle::calculateEstimationBetweenSteps( if (result) { -#if DEBUG_DRAWING DEBUG_DRAWING_POLYGON(hullFront, "yellow", debugNamespace + "_hull_front"); -#endif result = combinePolygon(polygon, hullFront, polygon); } } diff --git a/ad_rss/impl/src/unstructured/TrajectoryVehicle.hpp b/ad_rss/impl/src/unstructured/TrajectoryVehicle.hpp index e163e88420..76ffa153ea 100644 --- a/ad_rss/impl/src/unstructured/TrajectoryVehicle.hpp +++ b/ad_rss/impl/src/unstructured/TrajectoryVehicle.hpp @@ -82,14 +82,12 @@ class TrajectoryVehicle * @brief Calculate all trajectory points at response time * * @param[in] vehicleState current state of the vehicle - * @param[out] trajectorySetSteps intermediate steps between back and front * @param[out] frontSide the trajectory points defining the front * @param[out] backSide the trajectory points defining the back * * @returns false if a failure occurred during calculations, true otherwise */ bool getResponseTimeTrajectoryPoints(situation::VehicleState const &vehicleState, - std::vector &trajectorySetSteps, TrajectorySetStep &frontSide, TrajectorySetStep &backSide) const; @@ -117,15 +115,13 @@ class TrajectoryVehicle * @param[in] acceleration acceleration to use * @param[in] duration duration of accelerated movement * @param[in] dynamics dynamics to use - * @param[in] afterResponseTime is the movement happening after response time (no more heading change) * * @returns false if a failure occurred during calculations, true otherwise */ bool calculateNextTrajectoryPoint(TrajectoryPoint ¤tPoint, physics::Acceleration const &acceleration, physics::Duration const &duration, - ::ad::rss::world::RssDynamics const &dynamics, - bool afterResponseTime) const; + ::ad::rss::world::RssDynamics const &dynamics) const; /** * @brief Calculate a time in movement until response time @@ -145,7 +141,6 @@ class TrajectoryVehicle * * @param[in] vehicleState current state of the vehicle * @param[in] timeAfterResponseTime time after the response time to move - * @param[in] responseTimeTrajectorySetSteps intermediate steps between back and front * @param[in] responseTimeFrontSide the trajectory points defining the front * @param[in] responseTimeBackSide the trajectory points defining the back * @param[out] resultPolygon the resulting brake polygon @@ -155,7 +150,6 @@ class TrajectoryVehicle */ bool calculateBrake(situation::VehicleState const &vehicleState, ad::physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, TrajectorySetStep const &responseTimeBackSide, Polygon &resultPolygon, @@ -166,7 +160,6 @@ class TrajectoryVehicle * * @param[in] vehicleState current state of the vehicle * @param[in] timeAfterResponseTime time after the response time to move - * @param[in] responseTimeTrajectorySetSteps intermediate steps between back and front * @param[in] responseTimeFrontSide the trajectory points defining the front * @param[in] brakePolygon the polygon defining the brake trajectory set * @param[in] brakeMinStepVehicleLocation the vehicle locations for brakeMin after response time @@ -176,7 +169,6 @@ class TrajectoryVehicle */ bool calculateContinueForward(situation::VehicleState const &vehicleState, physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, Polygon const &brakePolygon, TrajectorySetStepVehicleLocation const &brakeMinStepVehicleLocation, @@ -202,7 +194,6 @@ class TrajectoryVehicle * * @param[in] vehicleState current state of the vehicle * @param[in] timeAfterResponseTime time after the response time to move - * @param[in] responseTimeTrajectorySetSteps intermediate steps between back and front * @param[in] responseTimeFrontSide the trajectory points defining the front * @param[in] initialStepVehicleLocation the vehicle locations for the initial calculation step * @param[in] accelerations accelerations to calculate @@ -214,7 +205,6 @@ class TrajectoryVehicle */ bool calculateTrajectorySetFrontAndSide(situation::VehicleState const &vehicleState, physics::Duration const &timeAfterResponseTime, - std::vector const &responseTimeTrajectorySetSteps, TrajectorySetStep const &responseTimeFrontSide, TrajectorySetStepVehicleLocation const &initialStepVehicleLocation, std::vector const &accelerations, diff --git a/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotTests.cpp index c0689f6d04..b412955774 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotTests.cpp @@ -92,10 +92,6 @@ class SituationSnapshotTests : public testing::Test std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -220,11 +216,6 @@ class SituationSnapshotTests : public testing::Test std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -389,11 +380,6 @@ class SituationSnapshotTests : public testing::Test std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; @@ -598,10 +584,6 @@ TEST_F(SituationSnapshotTests, comparisonOperatorDefaultEgoVehicleRssDynamicsDif std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -715,10 +697,6 @@ TEST_F(SituationSnapshotTests, comparisonOperatorSituationsDiffers) std::numeric_limits::max()}; situationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = situationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t situationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - situationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = situationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t situationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; situationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -875,11 +853,6 @@ TEST_F(SituationSnapshotTests, comparisonOperatorSituationsDiffers) std::numeric_limits::max()}; situationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = situationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - situationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - situationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = situationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t situationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; situationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotValidInputRangeTests.cpp index 28292e2cef..a694ff4721 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/SituationSnapshotValidInputRangeTests.cpp @@ -84,10 +84,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -210,11 +206,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -378,11 +369,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -530,10 +516,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -656,11 +638,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -824,11 +801,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -984,10 +956,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1110,11 +1078,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1278,11 +1241,6 @@ TEST(SituationSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicle std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueSituationsElementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/situation/SituationTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/SituationTests.cpp index 994f7abbb1..faf21e3700 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/SituationTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/SituationTests.cpp @@ -111,10 +111,6 @@ class SituationTests : public testing::Test std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -239,10 +235,6 @@ class SituationTests : public testing::Test std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -464,10 +456,6 @@ TEST_F(SituationTests, comparisonOperatorEgoVehicleStateDiffers) std::numeric_limits::max()}; egoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = egoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t egoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - egoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = egoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t egoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; egoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -598,10 +586,6 @@ TEST_F(SituationTests, comparisonOperatorOtherVehicleStateDiffers) std::numeric_limits::max()}; otherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = otherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t otherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - otherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = otherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t otherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; otherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/situation/SituationValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/SituationValidInputRangeTests.cpp index 16a6ae7217..8c2aa6cf5f 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/SituationValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/SituationValidInputRangeTests.cpp @@ -103,10 +103,6 @@ TEST(SituationValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -229,10 +225,6 @@ TEST(SituationValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -379,10 +371,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeSituationTypeTooSmall) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -505,10 +493,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeSituationTypeTooSmall) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -659,10 +643,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeSituationTypeTooBig) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -785,10 +765,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeSituationTypeTooBig) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -939,10 +915,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeEgoVehicleStateTooSmall) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1065,10 +1037,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeEgoVehicleStateTooSmall) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1225,10 +1193,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeEgoVehicleStateTooBig) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1351,10 +1315,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeEgoVehicleStateTooBig) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1511,10 +1471,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeOtherVehicleStateTooSmall std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1637,10 +1593,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeOtherVehicleStateTooSmall std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1797,10 +1749,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeOtherVehicleStateTooBig) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1923,10 +1871,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeOtherVehicleStateTooBig) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2083,10 +2027,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeRelativePositionTooSmall) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2209,10 +2149,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeRelativePositionTooSmall) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2366,10 +2302,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeRelativePositionTooBig) std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2492,10 +2424,6 @@ TEST(SituationValidInputRangeTests, testValidInputRangeRelativePositionTooBig) std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/situation/SituationVectorValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/SituationVectorValidInputRangeTests.cpp index 3aafe88d9a..fbbe44f573 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/SituationVectorValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/SituationVectorValidInputRangeTests.cpp @@ -111,10 +111,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeValidInputRangeMax) std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -239,10 +235,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeValidInputRangeMax) std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -392,10 +384,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeHigherThanInputRang std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -520,10 +508,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeHigherThanInputRang std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -683,10 +667,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeElementValid) std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -811,10 +791,6 @@ TEST(SituationVectorValidInputRangeTests, testValidInputRangeElementValid) std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementOtherVehicleStateDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementOtherVehicleStateDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateTests.cpp index 699a2f87aa..849228dcab 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateTests.cpp @@ -97,10 +97,6 @@ class VehicleStateTests : public testing::Test uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -277,10 +273,6 @@ TEST_F(VehicleStateTests, comparisonOperatorDynamicsDiffers) uint32_t dynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::max()}; dynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = dynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t dynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - dynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = dynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t dynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::max()}; dynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = dynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; diff --git a/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateValidInputRangeTests.cpp index 48856ceecf..b046cb1c58 100644 --- a/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/situation/VehicleStateValidInputRangeTests.cpp @@ -89,10 +89,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRange) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -212,10 +208,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeVelocityTooSmall) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -343,10 +335,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeVelocityTooBig) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -474,10 +462,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDynamicsTooSmall) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -605,10 +589,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDynamicsTooBig) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -736,10 +716,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDistanceToEnterInterse uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -869,10 +845,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDistanceToEnterInterse uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1004,10 +976,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDistanceToLeaveInterse uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1131,10 +1099,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeDistanceToLeaveInterse uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1271,10 +1235,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeObjectTypeTooSmall) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1398,10 +1358,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeObjectTypeTooBig) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1525,10 +1481,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeObjectStateTooSmall) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1654,10 +1606,6 @@ TEST(VehicleStateValidInputRangeTests, testValidInputRangeObjectStateTooBig) uint32_t valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotTests.cpp b/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotTests.cpp index c6b2359fda..f496cb5162 100644 --- a/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotTests.cpp @@ -92,10 +92,6 @@ class RssStateSnapshotTests : public testing::Test std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -457,10 +453,6 @@ TEST_F(RssStateSnapshotTests, comparisonOperatorDefaultEgoVehicleRssDynamicsDiff std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotValidInputRangeTests.cpp index be7bb2fb33..cdf06d576a 100644 --- a/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/state/RssStateSnapshotValidInputRangeTests.cpp @@ -84,10 +84,6 @@ TEST(RssStateSnapshotValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -388,10 +384,6 @@ TEST(RssStateSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicleR std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -700,10 +692,6 @@ TEST(RssStateSnapshotValidInputRangeTests, testValidInputRangeDefaultEgoVehicleR std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsTests.cpp index 360163ab6b..4c805cf822 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsTests.cpp @@ -77,10 +77,6 @@ class RssDynamicsTests : public testing::Test uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -232,9 +228,6 @@ TEST_F(RssDynamicsTests, comparisonOperatorUnstructuredSettingsDiffers) unstructuredSettings.vehicleFrontIntermediateRatioSteps = unstructuredSettingsVehicleFrontIntermediateRatioSteps; uint32_t unstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::max()}; unstructuredSettings.vehicleBackIntermediateRatioSteps = unstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t unstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::max()}; - unstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = unstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t unstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::max()}; unstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = unstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; diff --git a/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsValidInputRangeTests.cpp index 3b2df87f04..7e79879bf9 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/RssDynamicsValidInputRangeTests.cpp @@ -70,10 +70,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRange) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -137,10 +133,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeAlphaLonTooSmall) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -210,10 +202,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeAlphaLonTooBig) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -283,10 +271,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeAlphaLatTooSmall) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -356,10 +340,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeAlphaLatTooBig) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -429,10 +409,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeLateralFluctuationMargi uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -506,10 +482,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeLateralFluctuationMargi uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -590,10 +562,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeResponseTimeTooSmall) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -666,10 +634,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeResponseTimeTooBig) uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -750,10 +714,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeMaxSpeedOnAccelerationT uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -821,10 +781,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeMaxSpeedOnAccelerationT uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -900,10 +856,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeUnstructuredSettingsToo uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; @@ -973,10 +925,6 @@ TEST(RssDynamicsValidInputRangeTests, testValidInputRangeUnstructuredSettingsToo uint32_t valueUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; valueUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps = valueUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps; diff --git a/ad_rss/impl/test/generated/ad/rss/world/SceneTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/SceneTests.cpp index 8cacae91d7..0374b5f245 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/SceneTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/SceneTests.cpp @@ -153,10 +153,6 @@ class SceneTests : public testing::Test std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -289,10 +285,6 @@ class SceneTests : public testing::Test std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -564,10 +556,6 @@ TEST_F(SceneTests, comparisonOperatorEgoVehicleRssDynamicsDiffers) std::numeric_limits::max()}; egoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = egoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t egoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - egoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = egoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t egoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; egoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -713,10 +701,6 @@ TEST_F(SceneTests, comparisonOperatorObjectRssDynamicsDiffers) uint32_t objectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps{std::numeric_limits::max()}; objectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = objectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t objectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - objectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = objectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t objectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; objectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/world/SceneValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/SceneValidInputRangeTests.cpp index 6f371861e5..c87c38e374 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/SceneValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/SceneValidInputRangeTests.cpp @@ -145,10 +145,6 @@ TEST(SceneValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -281,10 +277,6 @@ TEST(SceneValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -489,10 +481,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeSituationTypeTooSmall) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -625,10 +613,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeSituationTypeTooSmall) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -837,10 +821,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeSituationTypeTooBig) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -973,10 +953,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeSituationTypeTooBig) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1185,10 +1161,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleTooSmall) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1321,10 +1293,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleTooSmall) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1535,10 +1503,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleTooBig) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1671,10 +1635,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleTooBig) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1885,10 +1845,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleRssDynamicsTooSmall std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2021,10 +1977,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleRssDynamicsTooSmall std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2237,10 +2189,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleRssDynamicsTooBig) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2373,10 +2321,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeEgoVehicleRssDynamicsTooBig) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2589,10 +2533,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectTooSmall) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2725,10 +2665,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectTooSmall) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -2939,10 +2875,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectTooBig) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -3075,10 +3007,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectTooBig) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -3289,10 +3217,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectRssDynamicsTooSmall) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -3425,10 +3349,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectRssDynamicsTooSmall) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -3641,10 +3561,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectRssDynamicsTooBig) std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -3777,10 +3693,6 @@ TEST(SceneValidInputRangeTests, testValidInputRangeObjectRssDynamicsTooBig) std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/world/SceneVectorValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/SceneVectorValidInputRangeTests.cpp index 37a43d717d..7266762ffc 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/SceneVectorValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/SceneVectorValidInputRangeTests.cpp @@ -153,10 +153,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeValidInputRangeMax) std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -289,10 +285,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeValidInputRangeMax) std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -501,10 +493,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeHigherThanInputRangeMax std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -637,10 +625,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeHigherThanInputRangeMax std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -859,10 +843,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeElementValid) std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -995,10 +975,6 @@ TEST(SceneVectorValidInputRangeTests, testValidInputRangeElementValid) std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = elementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - elementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = elementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t elementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; elementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsTests.cpp index f97c59f10c..bd7e4e07b5 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsTests.cpp @@ -42,8 +42,6 @@ class UnstructuredSettingsTests : public testing::Test value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -178,17 +176,6 @@ TEST_F(UnstructuredSettingsTests, comparisonOperatorVehicleBackIntermediateRatio EXPECT_TRUE(valueA != valueB); } -TEST_F(UnstructuredSettingsTests, comparisonOperatorVehicleResponseTimeIntermediateAccelerationStepsDiffers) -{ - ::ad::rss::world::UnstructuredSettings valueA = mValue; - uint32_t vehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::max()}; - valueA.vehicleResponseTimeIntermediateAccelerationSteps = vehicleResponseTimeIntermediateAccelerationSteps; - ::ad::rss::world::UnstructuredSettings valueB = mValue; - - EXPECT_FALSE(valueA == valueB); - EXPECT_TRUE(valueA != valueB); -} - TEST_F(UnstructuredSettingsTests, comparisonOperatorVehicleBrakeIntermediateAccelerationStepsDiffers) { ::ad::rss::world::UnstructuredSettings valueA = mValue; diff --git a/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsValidInputRangeTests.cpp index 5d36c5fd85..ddf69062f1 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/UnstructuredSettingsValidInputRangeTests.cpp @@ -35,8 +35,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRange) value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -61,8 +59,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangePedestrianTurn value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -91,8 +87,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangePedestrianTurn value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -129,8 +123,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeDriveAwayMaxAn value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -159,8 +151,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeDriveAwayMaxAn value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -197,8 +187,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleYawRate value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -227,8 +215,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleYawRate value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -265,8 +251,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleMinRadi value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -295,8 +279,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleMinRadi value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -333,8 +315,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleTraject value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; @@ -363,8 +343,6 @@ TEST(UnstructuredSettingsValidInputRangeTests, testValidInputRangeVehicleTraject value.vehicleFrontIntermediateRatioSteps = valueVehicleFrontIntermediateRatioSteps; uint32_t valueVehicleBackIntermediateRatioSteps{std::numeric_limits::min()}; value.vehicleBackIntermediateRatioSteps = valueVehicleBackIntermediateRatioSteps; - uint32_t valueVehicleResponseTimeIntermediateAccelerationSteps{std::numeric_limits::min()}; - value.vehicleResponseTimeIntermediateAccelerationSteps = valueVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueVehicleBrakeIntermediateAccelerationSteps{std::numeric_limits::min()}; value.vehicleBrakeIntermediateAccelerationSteps = valueVehicleBrakeIntermediateAccelerationSteps; uint32_t valueVehicleContinueForwardIntermediateAccelerationSteps{std::numeric_limits::min()}; diff --git a/ad_rss/impl/test/generated/ad/rss/world/WorldModelTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/WorldModelTests.cpp index 44a764e492..3c9b46ed12 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/WorldModelTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/WorldModelTests.cpp @@ -92,10 +92,6 @@ class WorldModelTests : public testing::Test std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -255,11 +251,6 @@ class WorldModelTests : public testing::Test std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t - valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -410,10 +401,6 @@ class WorldModelTests : public testing::Test std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -638,10 +625,6 @@ TEST_F(WorldModelTests, comparisonOperatorDefaultEgoVehicleRssDynamicsDiffers) std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t defaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; defaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -798,10 +781,6 @@ TEST_F(WorldModelTests, comparisonOperatorScenesDiffers) std::numeric_limits::max()}; scenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = scenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t scenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - scenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = scenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t scenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; scenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -935,10 +914,6 @@ TEST_F(WorldModelTests, comparisonOperatorScenesDiffers) std::numeric_limits::max()}; scenesElementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = scenesElementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t scenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::max()}; - scenesElementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = scenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t scenesElementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::max()}; scenesElementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/impl/test/generated/ad/rss/world/WorldModelValidInputRangeTests.cpp b/ad_rss/impl/test/generated/ad/rss/world/WorldModelValidInputRangeTests.cpp index a834a54861..c948fd6897 100644 --- a/ad_rss/impl/test/generated/ad/rss/world/WorldModelValidInputRangeTests.cpp +++ b/ad_rss/impl/test/generated/ad/rss/world/WorldModelValidInputRangeTests.cpp @@ -84,10 +84,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -246,10 +242,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -399,10 +391,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRange) std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -572,10 +560,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -734,10 +718,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -887,10 +867,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1068,10 +1044,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueDefaultEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueDefaultEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1230,10 +1202,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementEgoVehicleRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementEgoVehicleRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps @@ -1383,10 +1351,6 @@ TEST(WorldModelValidInputRangeTests, testValidInputRangeDefaultEgoVehicleRssDyna std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBackIntermediateRatioSteps = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBackIntermediateRatioSteps; - uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps{ - std::numeric_limits::min()}; - valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleResponseTimeIntermediateAccelerationSteps - = valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleResponseTimeIntermediateAccelerationSteps; uint32_t valueScenesElementObjectRssDynamicsUnstructuredSettingsVehicleBrakeIntermediateAccelerationSteps{ std::numeric_limits::min()}; valueScenesElementObjectRssDynamicsUnstructuredSettings.vehicleBrakeIntermediateAccelerationSteps diff --git a/ad_rss/python/generate_python_lib.py.in b/ad_rss/python/generate_python_lib.py.in index 561c9da48b..e8c9a374cb 100644 --- a/ad_rss/python/generate_python_lib.py.in +++ b/ad_rss/python/generate_python_lib.py.in @@ -42,7 +42,6 @@ def main(): declarations_component=declarations.copy() declarations_component.add(main_namespace) - ignore_files={} ignore_declarations={} additional_includes={} if component == "state": @@ -63,10 +62,6 @@ def main(): header_dirs = { "@CMAKE_CURRENT_LIST_DIR@/../impl/include/ad/rss/{}".format(component) } - ignore_files={ - # leave out DebugDrawing having errors - "DebugDrawing.hpp" - } else: header_dirs = { "@CMAKE_CURRENT_LIST_DIR@/../generated/include/ad/rss/{}".format(component), @@ -79,8 +74,7 @@ def main(): include_paths=include_dirs, main_namespace=main_namespace, declarations=declarations_component, - ignore_declarations=ignore_declarations, - ignore_files=ignore_files) + ignore_declarations=ignore_declarations) additional_replacements_component = additional_replacements.copy() additional_replacements_component.add( diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 538a24ce7c..d31ff9e10a 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,6 +1,12 @@ ## Latest changes +## Release 4.3.0 + +#### :ghost: Maintenance +* Unstructured constellation polygon creation: Fix vehicle curvature calculation after response time, make DebugDrawing accessible from python + + ## Release 4.2.0 #### :ghost: Maintenance diff --git a/doc/ad_rss/UnstructuredConstellations.md b/doc/ad_rss/UnstructuredConstellations.md index 819088297d..02af6e04c8 100644 --- a/doc/ad_rss/UnstructuredConstellations.md +++ b/doc/ad_rss/UnstructuredConstellations.md @@ -60,14 +60,13 @@ The calculation is done in three steps. In the first step, the vehicle state at response time is calculated by using time increments, specified by `UnstructuredSettings::vehicleTrajectoryCalculationStep`. (This might lead to an increasing error the farer the point is). The amount of states can be customized by several parameters: -- `UnstructuredSettings::vehicleResponseTimeIntermediateAccelerationSteps` specifies how many acceleration values between `alphaLon.brakeMax` and `alphaLon.AccelMax` should be used for calculation. - `UnstructuredSettings::vehicleBackIntermediateRatioSteps` specifies how many steps beside maximum yaw rate change to the left/right and no change at all should be calculated. The value is specifying the steps on one side, therefore the resulting intermediate steps are twice this value. This value is used for the back of the trajectory set. - `UnstructuredSettings::vehicleFrontIntermediateRatioSteps` similar to above, but for the front of the trajectory set. In the second step, the final vehicle state is calculated for each of the response-time vehicle states by using the corresponding acceleration driven on a circle. The following parameters can be specified: -- `UnstructuredSettings::vehicleContinueForwardIntermediateAccelerationSteps` specifies the intermediate acceleration steps (between brakeMin and accelMax) used while calculating the continue forward trajectory set. This is applied to all `UnstructuredSettings::vehicleResponseTimeIntermediateAccelerationSteps`, therefore it has only an effect if that value is >0. -- `UnstructuredSettings::vehicleBrakeIntermediateAccelerationSteps` specifies the intermediate acceleration steps (between brakeMax and brakeMin) used while calculating the brake trajectory set. This is applied to all `UnstructuredSettings::vehicleResponseTimeIntermediateAccelerationSteps`, therefore it has only an effect if that value is >0. +- `UnstructuredSettings::vehicleContinueForwardIntermediateAccelerationSteps` specifies the intermediate acceleration steps (between brakeMin and accelMax) used while calculating the continue forward trajectory set. +- `UnstructuredSettings::vehicleBrakeIntermediateAccelerationSteps` specifies the intermediate acceleration steps (between brakeMax and brakeMin) used while calculating the brake trajectory set. In the third step the final trajectory sets are calculated. To reach an acceptable calculation time some simplification are applied. Keep in mind, that this might cause invalid responses! For each value of acceleration a final state is calculated. This contains of at least three vehicles states: two with maximum yaw rate change to left and right and one with no yaw rate change. For the back and front of the trajectory set there might also be intermediate values for the yaw rate change. For the front a convex hull of all states (including vehicle dimensions) is calculated. For the ones defining the sides of the trajectory set (where only max left/right and center vehicle state are available) a polygon is calculated by merging the convex hull of left+center and right+center. To create the trajectory set all polygons are merged together, including polygons for the linear estimation between the steps.