diff --git a/simulator/learning_based_vehicle_model/CHANGELOG.rst b/simulator/autoware_learning_based_vehicle_model/CHANGELOG.rst similarity index 95% rename from simulator/learning_based_vehicle_model/CHANGELOG.rst rename to simulator/autoware_learning_based_vehicle_model/CHANGELOG.rst index ed271370a6840..d58a509138a83 100644 --- a/simulator/learning_based_vehicle_model/CHANGELOG.rst +++ b/simulator/autoware_learning_based_vehicle_model/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package learning_based_vehicle_model -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_learning_based_vehicle_model +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/simulator/learning_based_vehicle_model/CMakeLists.txt b/simulator/autoware_learning_based_vehicle_model/CMakeLists.txt similarity index 92% rename from simulator/learning_based_vehicle_model/CMakeLists.txt rename to simulator/autoware_learning_based_vehicle_model/CMakeLists.txt index 58a3ad57e6f9e..02159e7d282bc 100644 --- a/simulator/learning_based_vehicle_model/CMakeLists.txt +++ b/simulator/autoware_learning_based_vehicle_model/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14.4) -project(learning_based_vehicle_model) +project(autoware_learning_based_vehicle_model) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/simulator/learning_based_vehicle_model/README.md b/simulator/autoware_learning_based_vehicle_model/README.md similarity index 100% rename from simulator/learning_based_vehicle_model/README.md rename to simulator/autoware_learning_based_vehicle_model/README.md diff --git a/simulator/learning_based_vehicle_model/image/python_model_interface.png b/simulator/autoware_learning_based_vehicle_model/image/python_model_interface.png similarity index 100% rename from simulator/learning_based_vehicle_model/image/python_model_interface.png rename to simulator/autoware_learning_based_vehicle_model/image/python_model_interface.png diff --git a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/interconnected_model.hpp b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/interconnected_model.hpp similarity index 86% rename from simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/interconnected_model.hpp rename to simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/interconnected_model.hpp index 56a196c257189..b08a8957dff7d 100644 --- a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/interconnected_model.hpp +++ b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/interconnected_model.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ -#define LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ +#ifndef AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ +#define AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ -#include "learning_based_vehicle_model/model_connections_helpers.hpp" -#include "learning_based_vehicle_model/simple_pymodel.hpp" -#include "learning_based_vehicle_model/submodel_interface.hpp" +#include "autoware/learning_based_vehicle_model/model_connections_helpers.hpp" +#include "autoware/learning_based_vehicle_model/simple_pymodel.hpp" +#include "autoware/learning_based_vehicle_model/submodel_interface.hpp" #include #include @@ -29,6 +29,9 @@ #include #include +namespace autoware::simulator::learning_based_vehicle_model +{ + namespace py = pybind11; class __attribute__((visibility("default"))) InterconnectedModel @@ -127,4 +130,6 @@ class __attribute__((visibility("default"))) InterconnectedModel std::vector updatePyModel(std::vector psim_input); }; -#endif // LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ +} // namespace autoware::simulator::learning_based_vehicle_model + +#endif // AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__INTERCONNECTED_MODEL_HPP_ diff --git a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/model_connections_helpers.hpp b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/model_connections_helpers.hpp similarity index 68% rename from simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/model_connections_helpers.hpp rename to simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/model_connections_helpers.hpp index 0d46169600b2f..94d206fece130 100644 --- a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/model_connections_helpers.hpp +++ b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/model_connections_helpers.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,12 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ -#define LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ +#ifndef AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ +#define AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ #include #include +namespace autoware::simulator::learning_based_vehicle_model +{ + std::vector fillVectorUsingMap( std::vector vector1, std::vector vector2, const std::vector & map, bool inverse); @@ -25,4 +28,6 @@ std::vector fillVectorUsingMap( std::vector createConnectionsMap( const std::vector & connection_names_1, const std::vector & connection_names_2); -#endif // LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ +} // namespace autoware::simulator::learning_based_vehicle_model + +#endif // AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__MODEL_CONNECTIONS_HELPERS_HPP_ diff --git a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/simple_pymodel.hpp b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/simple_pymodel.hpp similarity index 85% rename from simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/simple_pymodel.hpp rename to simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/simple_pymodel.hpp index fd9cf5cf44de9..270a30b5e23dd 100644 --- a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/simple_pymodel.hpp +++ b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/simple_pymodel.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,11 +13,11 @@ // limitations under the License. // cspell:ignore pymodel -#ifndef LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ -#define LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ +#ifndef AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ +#define AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ -#include "learning_based_vehicle_model/model_connections_helpers.hpp" -#include "learning_based_vehicle_model/submodel_interface.hpp" +#include "autoware/learning_based_vehicle_model/model_connections_helpers.hpp" +#include "autoware/learning_based_vehicle_model/submodel_interface.hpp" #include #include @@ -25,6 +25,9 @@ #include #include +namespace autoware::simulator::learning_based_vehicle_model +{ + namespace py = pybind11; /** @@ -99,4 +102,6 @@ class SimplePyModel : public SubModelInterface void mapOutputs(std::vector signals_vec_names) override; }; -#endif // LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ +} // namespace autoware::simulator::learning_based_vehicle_model + +#endif // AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SIMPLE_PYMODEL_HPP_ diff --git a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/submodel_interface.hpp b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/submodel_interface.hpp similarity index 82% rename from simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/submodel_interface.hpp rename to simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/submodel_interface.hpp index 1cbad103278fb..f97158aadcd2b 100644 --- a/simulator/learning_based_vehicle_model/include/learning_based_vehicle_model/submodel_interface.hpp +++ b/simulator/autoware_learning_based_vehicle_model/include/autoware/learning_based_vehicle_model/submodel_interface.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,11 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ -#define LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ +#ifndef AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ +#define AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ #include +namespace autoware::simulator::learning_based_vehicle_model +{ + class SubModelInterface { public: @@ -59,4 +62,6 @@ class SubModelInterface std::vector model_signals_vec, std::vector model_signals_vec_next) = 0; }; -#endif // LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ +} // namespace autoware::simulator::learning_based_vehicle_model + +#endif // AUTOWARE__LEARNING_BASED_VEHICLE_MODEL__SUBMODEL_INTERFACE_HPP_ diff --git a/simulator/learning_based_vehicle_model/package.xml b/simulator/autoware_learning_based_vehicle_model/package.xml similarity index 78% rename from simulator/learning_based_vehicle_model/package.xml rename to simulator/autoware_learning_based_vehicle_model/package.xml index 317be3d0990ca..b6b381801636d 100644 --- a/simulator/learning_based_vehicle_model/package.xml +++ b/simulator/autoware_learning_based_vehicle_model/package.xml @@ -1,11 +1,12 @@ - learning_based_vehicle_model + autoware_learning_based_vehicle_model 0.40.0 - learning_based_vehicle_model for simple_planning_simulator + autoware_learning_based_vehicle_model for simple_planning_simulator Maxime Clement Tomas Nagy + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/simulator/learning_based_vehicle_model/src/interconnected_model.cpp b/simulator/autoware_learning_based_vehicle_model/src/interconnected_model.cpp similarity index 95% rename from simulator/learning_based_vehicle_model/src/interconnected_model.cpp rename to simulator/autoware_learning_based_vehicle_model/src/interconnected_model.cpp index e495aceb8da9c..1f92e8cd058a5 100644 --- a/simulator/learning_based_vehicle_model/src/interconnected_model.cpp +++ b/simulator/autoware_learning_based_vehicle_model/src/interconnected_model.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,12 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "learning_based_vehicle_model/interconnected_model.hpp" +#include "autoware/learning_based_vehicle_model/interconnected_model.hpp" #include #include #include +namespace autoware::simulator::learning_based_vehicle_model +{ + void InterconnectedModel::mapInputs(std::vector in_names) { // index in "map_in_to_sig_vec" is index in "in_names" and value in "map_in_to_sig_vec" is index @@ -139,3 +142,5 @@ std::vector InterconnectedModel::updatePyModel(std::vector psim_ return psim_next_state; } + +} // namespace autoware::simulator::learning_based_vehicle_model diff --git a/simulator/learning_based_vehicle_model/src/model_connections_helpers.cpp b/simulator/autoware_learning_based_vehicle_model/src/model_connections_helpers.cpp similarity index 88% rename from simulator/learning_based_vehicle_model/src/model_connections_helpers.cpp rename to simulator/autoware_learning_based_vehicle_model/src/model_connections_helpers.cpp index b300f3837b18a..284607744e218 100644 --- a/simulator/learning_based_vehicle_model/src/model_connections_helpers.cpp +++ b/simulator/autoware_learning_based_vehicle_model/src/model_connections_helpers.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,10 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "learning_based_vehicle_model/model_connections_helpers.hpp" +#include "autoware/learning_based_vehicle_model/model_connections_helpers.hpp" #include +namespace autoware::simulator::learning_based_vehicle_model +{ + std::vector fillVectorUsingMap( std::vector vector1, std::vector vector2, const std::vector & map, bool inverse) @@ -48,3 +51,5 @@ std::vector createConnectionsMap( } return connection_map; } + +} // namespace autoware::simulator::learning_based_vehicle_model diff --git a/simulator/learning_based_vehicle_model/src/simple_pymodel.cpp b/simulator/autoware_learning_based_vehicle_model/src/simple_pymodel.cpp similarity index 94% rename from simulator/learning_based_vehicle_model/src/simple_pymodel.cpp rename to simulator/autoware_learning_based_vehicle_model/src/simple_pymodel.cpp index 10581179baf4a..50ceb14ff90e6 100644 --- a/simulator/learning_based_vehicle_model/src/simple_pymodel.cpp +++ b/simulator/autoware_learning_based_vehicle_model/src/simple_pymodel.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "learning_based_vehicle_model/simple_pymodel.hpp" +#include "autoware/learning_based_vehicle_model/simple_pymodel.hpp" #include #include @@ -20,6 +20,9 @@ #include #include +namespace autoware::simulator::learning_based_vehicle_model +{ + namespace py = pybind11; SimplePyModel::SimplePyModel( @@ -110,3 +113,5 @@ void SimplePyModel::mapOutputs(std::vector signals_vec_names) // "map_py_model_outputs_to_sig_vec" is index in "signals_vec_names" map_py_model_outputs_to_sig_vec = createConnectionsMap(signals_vec_names, py_model_state_names); } + +} // namespace autoware::simulator::learning_based_vehicle_model diff --git a/simulator/learning_based_vehicle_model/src/submodel_interface.cpp b/simulator/autoware_learning_based_vehicle_model/src/submodel_interface.cpp similarity index 82% rename from simulator/learning_based_vehicle_model/src/submodel_interface.cpp rename to simulator/autoware_learning_based_vehicle_model/src/submodel_interface.cpp index 906aff4b01ae0..cc525b990801b 100644 --- a/simulator/learning_based_vehicle_model/src/submodel_interface.cpp +++ b/simulator/autoware_learning_based_vehicle_model/src/submodel_interface.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 The Autoware Foundation. +// Copyright 2025 The Autoware Foundation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "learning_based_vehicle_model/submodel_interface.hpp" +#include "autoware/learning_based_vehicle_model/submodel_interface.hpp" diff --git a/simulator/autoware_simple_planning_simulator/CMakeLists.txt b/simulator/autoware_simple_planning_simulator/CMakeLists.txt index ab4ac8218e193..18f2486796d96 100644 --- a/simulator/autoware_simple_planning_simulator/CMakeLists.txt +++ b/simulator/autoware_simple_planning_simulator/CMakeLists.txt @@ -3,7 +3,7 @@ project(autoware_simple_planning_simulator) find_package(autoware_cmake REQUIRED) find_package(Python3 COMPONENTS Interpreter Development) -find_package(learning_based_vehicle_model REQUIRED) +find_package(autoware_learning_based_vehicle_model REQUIRED) autoware_package() # Component @@ -25,7 +25,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED src/simple_planning_simulator/utils/csv_loader.cpp src/simple_planning_simulator/utils/mechanical_controller.cpp ) -target_include_directories(${PROJECT_NAME} PUBLIC ${Python3_INCLUDE_DIRS} ${learning_based_vehicle_model_INCLUDE_DIRS}) +target_include_directories(${PROJECT_NAME} PUBLIC ${Python3_INCLUDE_DIRS} ${autoware_learning_based_vehicle_model_INCLUDE_DIRS}) # Node executable rclcpp_components_register_node(${PROJECT_NAME} PLUGIN "autoware::simulator::simple_planning_simulator::SimplePlanningSimulator" diff --git a/simulator/autoware_simple_planning_simulator/README.md b/simulator/autoware_simple_planning_simulator/README.md index 385f4aa1c7eab..89fe55af1c3ff 100644 --- a/simulator/autoware_simple_planning_simulator/README.md +++ b/simulator/autoware_simple_planning_simulator/README.md @@ -64,7 +64,7 @@ The purpose of this simulator is for the integration test of planning and contro - `DELAY_STEER_ACC_GEARED` - `DELAY_STEER_ACC_GEARED_WO_FALL_GUARD` - `DELAY_STEER_MAP_ACC_GEARED`: applies 1D dynamics and time delay to the steering and acceleration commands. The simulated acceleration is determined by a value converted through the provided acceleration map. This model is valuable for an accurate simulation with acceleration deviations in a real vehicle. -- `LEARNED_STEER_VEL`: launches learned python models. More about this [here](../learning_based_vehicle_model). +- `LEARNED_STEER_VEL`: launches learned python models. More about this [here](../autoware_learning_based_vehicle_model). The following models receive `ACTUATION_CMD` generated from `raw_vehicle_cmd_converter`. Therefore, when these models are selected, the `raw_vehicle_cmd_converter` is also launched. diff --git a/simulator/autoware_simple_planning_simulator/include/autoware/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp b/simulator/autoware_simple_planning_simulator/include/autoware/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp index 124c0d2532069..0aa525cd3f5c1 100644 --- a/simulator/autoware_simple_planning_simulator/include/autoware/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp +++ b/simulator/autoware_simple_planning_simulator/include/autoware/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp @@ -15,8 +15,8 @@ #ifndef AUTOWARE__SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_LEARNED_STEER_VEL_HPP_ #define AUTOWARE__SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_LEARNED_STEER_VEL_HPP_ +#include "autoware/learning_based_vehicle_model/interconnected_model.hpp" #include "autoware/simple_planning_simulator/vehicle_model/sim_model_interface.hpp" -#include "learning_based_vehicle_model/interconnected_model.hpp" #include #include @@ -77,7 +77,7 @@ class SimModelLearnedSteerVel : public SimModelInterface /*delay steer velocity* STEER_DES, }; - InterconnectedModel vehicle; + autoware::simulator::learning_based_vehicle_model::InterconnectedModel vehicle; double prev_vx_ = 0.0; double current_ax_ = 0.0; diff --git a/simulator/autoware_simple_planning_simulator/package.xml b/simulator/autoware_simple_planning_simulator/package.xml index 790e48cd80cc1..47dbb3c0a422f 100644 --- a/simulator/autoware_simple_planning_simulator/package.xml +++ b/simulator/autoware_simple_planning_simulator/package.xml @@ -19,6 +19,7 @@ autoware_control_msgs autoware_lanelet2_extension + autoware_learning_based_vehicle_model autoware_map_msgs autoware_motion_utils autoware_planning_msgs @@ -27,7 +28,6 @@ autoware_vehicle_msgs geometry_msgs lanelet2_core - learning_based_vehicle_model nav_msgs rclcpp rclcpp_components diff --git a/simulator/autoware_simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.cpp b/simulator/autoware_simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.cpp index 2d9c8d8ab0e0e..ce7ba2d48bac2 100644 --- a/simulator/autoware_simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.cpp +++ b/simulator/autoware_simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.cpp @@ -14,7 +14,7 @@ #include "autoware/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp" -#include "learning_based_vehicle_model/interconnected_model.hpp" +#include "autoware/learning_based_vehicle_model/interconnected_model.hpp" #include #include