Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/synchronized action #1234

Merged
merged 87 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
45db78d
Add draft functions for synchronized action
curious-jp Jan 16, 2024
aa28c60
changed the function and made it simple
curious-jp Jan 16, 2024
bdb284d
Implemented a draft of getDistanceToTargetLaneletPose and requestSync…
curious-jp Jan 18, 2024
435e986
fixed revert and errors
curious-jp Jan 18, 2024
cbde06e
error is not fixed but pushing today's implements
curious-jp Jan 18, 2024
bced89e
Fix distance calculation in EntityBase::getDistanceToTargetLaneletPose()
curious-jp Jan 18, 2024
4cf36b8
Fix synchronization issue in EntityBase class
curious-jp Jan 24, 2024
36d4697
implemented atleast functions with no error
curious-jp Jan 24, 2024
4bb9f92
tried to format
curious-jp Jan 24, 2024
59ab9c7
Add requestSynchronize method to API and EntityManager and few bug fix
curious-jp Jan 24, 2024
a42a801
Made draft mock scenarios
curious-jp Jan 24, 2024
ab572de
Disable building of C++ mock scenarios and update requestSynchronize …
curious-jp Jan 29, 2024
0c5fb8b
Refactor synchronization logic and add new API method
curious-jp Feb 1, 2024
c4a673d
途中経過
curious-jp Feb 15, 2024
f18fc68
Update target lanelet poses and velocities
curious-jp Feb 20, 2024
f8f6f3e
Merge branch 'feature/synchronized_action' of https://github.com/tier…
curious-jp Feb 20, 2024
6e4af62
Update entity synchronization logic to consider acceleration limit
curious-jp Feb 22, 2024
01abacc
Update synchronized action behavior
curious-jp Mar 28, 2024
c5436e2
Update entity_base.hpp and synchronized_action.cpp
curious-jp Mar 29, 2024
0f089d5
Merge commit '253fa785573217ad3a6bde882724a9e35a0c99ed' into feature/…
curious-jp Mar 29, 2024
be53d79
Merge commit 'ada77d59ffd6545105e40e88e4ad50050062a3d6' into feature/…
curious-jp Apr 10, 2024
1f0cdc2
Fix lanelet target pose in synchronized action
curious-jp Apr 17, 2024
deb8181
Merge commit '27266909414686613cea4f9aa17162d33ecf4668' into feature/…
curious-jp Apr 17, 2024
5778c4d
Add map package for simple cross map
curious-jp Apr 17, 2024
f628acc
Remove debug logging statements and update function names
curious-jp Apr 17, 2024
b9931f9
Refactor synchronized action onUpdate method
curious-jp Apr 17, 2024
eff604d
added new line at the end of the code
curious-jp Apr 17, 2024
0739cf9
Add pointcloud_map.pcd to simple_cross_map
curious-jp Apr 17, 2024
eb81bd9
Fix distance margin typo and update comments in entity_base.cpp
curious-jp Apr 17, 2024
4f9bb11
Merge branch 'master' into feature/synchronized_action
curious-jp Apr 24, 2024
5379b5a
fixing accidentally changed map
curious-jp Apr 24, 2024
46ab1b3
Remove unnecessary code and include statements
curious-jp Apr 24, 2024
a7ca89d
Refactor entity_base.cpp to improve code readability
curious-jp Apr 24, 2024
d2d33c9
Update package version and fix const correctness in entity manager an…
curious-jp May 8, 2024
7b60fbb
Refactor synchronization logic in EntityBase::requestSynchronize()
curious-jp May 8, 2024
c734d51
Update package version and refactor reachPosition method
curious-jp May 22, 2024
902e2e4
Merge commit '8a9b141aaf6cf5a58f537781a47f66e4c305cea3' into feature/…
curious-jp May 22, 2024
80bb321
Remove unused function reachPosition
curious-jp May 22, 2024
65afdb8
Merge commit 'f74901b45bbec4b3feb288c4ad86491de642f5ca' into feature/…
curious-jp May 22, 2024
c6d22d8
Fix requestLaneChange function formatting
curious-jp May 22, 2024
195734e
Fix requestLaneChange function signatures
curious-jp May 22, 2024
0e36b5c
Merge commit '1ceb05c7206e163eb8214ceb68f5e35e7880d7a4' into feature/…
curious-jp May 29, 2024
bdaacde
Update version number to 2.0.0 in package.xml
curious-jp May 29, 2024
0eb226a
refuctured code of synchronized action
curious-jp May 29, 2024
37d35ef
Update entity_base.hpp
curious-jp May 30, 2024
a7a4e5c
Merge branch 'master' into feature/synchronized_action
hakuturu583 Jun 5, 2024
585c029
Merge commit '45d42a79d92c370387749ad16c10665deb42e02c' into feature/…
curious-jp Jun 5, 2024
741b848
Merge branch 'feature/synchronized_action' of github.com:tier4/scenar…
curious-jp Jun 5, 2024
bd82e9c
Update version number to 2.0.2
curious-jp Jun 5, 2024
a98f9b1
Refactor entity_base.hpp and .cpp
curious-jp Jun 5, 2024
1935746
Fix typo in comment
curious-jp Jun 5, 2024
755e9f1
Merge branch 'master' of https://github.com/tier4/scenario_simulator_…
hakuturu583 Jun 10, 2024
30ffcd0
fix comment and bump version package
hakuturu583 Jun 10, 2024
c82ea1a
remvoe ReachPosition function
hakuturu583 Jun 10, 2024
b4b9173
add EntityBase::reachPosition function
hakuturu583 Jun 10, 2024
aa3a599
fix reachPosition function
hakuturu583 Jun 10, 2024
080f9d2
add getMaxAcceleration/getMaxDeceleration function
hakuturu583 Jun 10, 2024
3fcd709
Fix synchronization bug in entity_base.cpp
curious-jp Jun 12, 2024
9ae3d83
Update version number to 2.1.1 in package.xml
curious-jp Jun 12, 2024
1bf1a7c
Merge commit 'b03fd92759845935be79f7ac32366848c78a2a66' into feature/…
curious-jp Jun 12, 2024
8efcfc5
Refactor requestSynchronize function signature
curious-jp Jun 12, 2024
d350707
Fix formatting in synchronized_action.cpp
curious-jp Jun 12, 2024
66b1433
Refactor requestSynchronize function and add keepStepTime function
curious-jp Jun 12, 2024
7306a23
Add synchronized_action subdirectory and change return type of keepSt…
curious-jp Jun 12, 2024
ca837b1
Refactor synchronized_action.cpp to remove unnecessary parameter in r…
curious-jp Jun 12, 2024
722b822
Remove unused function and update step time in EntityBase
curious-jp Jun 12, 2024
e3ce487
Merge commit 'bd366bce147e65d5991b62db333cf35153dd96fb' into feature/…
curious-jp Jun 19, 2024
e337cb7
Update target lanelet poses in synchronized_action.cpp
curious-jp Jun 19, 2024
e304c6d
Update version number to 2.1.6 in package.xml
curious-jp Jun 19, 2024
298a659
removed comment
curious-jp Jun 19, 2024
2cf23b2
Merge commit 'bf6a962e14e3e85627fca226574120cdba30080e' into feature/…
curious-jp Jun 19, 2024
e660de0
Fix spawn positions in synchronized_action.cpp
curious-jp Jun 19, 2024
c4a840f
Update version to 2.1.7 in package.xml
curious-jp Jun 19, 2024
0a38401
Remove unnecessary include statement
curious-jp Jun 19, 2024
d5991f8
Merge remote-tracking branch 'origin/master' into feature/synchronize…
hakuturu583 Jun 24, 2024
a527ad5
Merge commit 'c50d79fce98242d76671360029b97c166412e76f' into feature/…
curious-jp Jun 26, 2024
724d658
Merge branch 'feature/synchronized_action' of github.com:tier4/scenar…
curious-jp Jun 26, 2024
2c55af1
Bump version of simple_cross_map from version 2.1.7 to version 2.2.0
curious-jp Jun 26, 2024
930861c
chore: Update requestSynchronize function signature to include target…
curious-jp Jun 26, 2024
0ba222e
chore: Update requestSynchronize function to fix border distance calc…
curious-jp Jun 26, 2024
0a2a478
chore: Update requestSynchronize function to fix border distance calc…
curious-jp Jun 26, 2024
838ff56
Update requestSynchronize function and added new test scenario.
curious-jp Jun 26, 2024
60320cb
fix bug
curious-jp Jun 26, 2024
03e61de
chore: Update requestSynchronize function parameter name for clarity
curious-jp Jun 26, 2024
48558ee
chore: format miss
curious-jp Jun 26, 2024
ddd5660
Merge branch 'master' into feature/synchronized_action
hakuturu583 Jun 28, 2024
9bff185
bump simple_cross_map package version
hakuturu583 Jun 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,016 changes: 4,008 additions & 4,008 deletions map/kashiwanoha_map/map/lanelet2_map.osm

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions map/simple_cross_map/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
cmake_minimum_required(VERSION 3.5)
project(simple_cross_map)

# Default to C99
if(NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 99)
endif()

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

# find dependencies
find_package(ament_cmake REQUIRED)

# install map file
install(DIRECTORY map
DESTINATION share/${PROJECT_NAME}
)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
endif()

ament_package()
7 changes: 7 additions & 0 deletions map/simple_cross_map/map/global_map_center.pcd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
map_config:
latitude: 35.238094905136874
longitude: 139.90095439549778
elevation: 1.0
roll: 0.0
pitch: 0.0
yaw: 0.0
Loading
Loading