Skip to content

Commit eed0af2

Browse files
Fixed to use autoware_learning_based_vehicle_model
Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>
1 parent 5378a3f commit eed0af2

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

simulator/simple_planning_simulator/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(simple_planning_simulator)
33

44
find_package(autoware_cmake REQUIRED)
55
find_package(Python3 COMPONENTS Interpreter Development)
6-
find_package(learning_based_vehicle_model REQUIRED)
6+
find_package(autoware_learning_based_vehicle_model REQUIRED)
77
autoware_package()
88

99
# Component
@@ -25,7 +25,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
2525
src/simple_planning_simulator/utils/csv_loader.cpp
2626
src/simple_planning_simulator/utils/mechanical_controller.cpp
2727
)
28-
target_include_directories(${PROJECT_NAME} PUBLIC ${Python3_INCLUDE_DIRS} ${learning_based_vehicle_model_INCLUDE_DIRS})
28+
target_include_directories(${PROJECT_NAME} PUBLIC ${Python3_INCLUDE_DIRS} ${autoware_learning_based_vehicle_model_INCLUDE_DIRS})
2929
# Node executable
3030
rclcpp_components_register_node(${PROJECT_NAME}
3131
PLUGIN "simulation::simple_planning_simulator::SimplePlanningSimulator"

simulator/simple_planning_simulator/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The purpose of this simulator is for the integration test of planning and contro
6464
- `DELAY_STEER_ACC_GEARED`
6565
- `DELAY_STEER_ACC_GEARED_WO_FALL_GUARD`
6666
- `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.
67-
- `LEARNED_STEER_VEL`: launches learned python models. More about this [here](../learning_based_vehicle_model).
67+
- `LEARNED_STEER_VEL`: launches learned python models. More about this [here](../autoware_learning_based_vehicle_model).
6868

6969
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.
7070

simulator/simple_planning_simulator/include/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_LEARNED_STEER_VEL_HPP_
1616
#define SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_LEARNED_STEER_VEL_HPP_
1717

18-
#include "learning_based_vehicle_model/interconnected_model.hpp"
18+
#include "autoware/learning_based_vehicle_model/interconnected_model.hpp"
1919
#include "simple_planning_simulator/vehicle_model/sim_model_interface.hpp"
2020

2121
#include <Eigen/Core>
@@ -74,7 +74,7 @@ class SimModelLearnedSteerVel : public SimModelInterface /*delay steer velocity*
7474
STEER_DES,
7575
};
7676

77-
InterconnectedModel vehicle;
77+
autoware::simulator::learning_based_vehicle_model::InterconnectedModel vehicle;
7878

7979
double prev_vx_ = 0.0;
8080
double current_ax_ = 0.0;

simulator/simple_planning_simulator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<depend>autoware_vehicle_msgs</depend>
2727
<depend>geometry_msgs</depend>
2828
<depend>lanelet2_core</depend>
29-
<depend>learning_based_vehicle_model</depend>
29+
<depend>autoware_learning_based_vehicle_model</depend>
3030
<depend>nav_msgs</depend>
3131
<depend>rclcpp</depend>
3232
<depend>rclcpp_components</depend>

simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "simple_planning_simulator/vehicle_model/sim_model_learned_steer_vel.hpp"
1616

17-
#include "learning_based_vehicle_model/interconnected_model.hpp"
17+
#include "autoware/learning_based_vehicle_model/interconnected_model.hpp"
1818

1919
#include <algorithm>
2020
#include <string>

0 commit comments

Comments
 (0)