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/context gamma #1460

Draft
wants to merge 56 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
620e6c4
transplant context_gamma_planner
curious-jp Nov 27, 2024
626093e
added mock scenarios of context gamma planner
curious-jp Nov 27, 2024
ab6065b
Remove unused RViz configuration files and mock catalogs
curious-jp Nov 27, 2024
9737a02
Add context_gamma_planner to CMakeLists.txt and package.xml
curious-jp Nov 27, 2024
dc3c98a
Remove unused dependency on cpp_mock_scenarios in package.xml
curious-jp Nov 27, 2024
9a41f3c
Refactor test_constraint_activator_base.cpp and remove unused RViz co…
curious-jp Nov 27, 2024
3041e3d
Refactored functions that involves with traffic lights
curious-jp Dec 18, 2024
494fce0
Merge remote-tracking branch 'origin/master' into feature/context_gamma
hakuturu583 Jan 31, 2025
290e6bc
fix compile error
hakuturu583 Jan 31, 2025
cde0fac
Merge remote-tracking branch 'origin/master' into feature/context_gamma
hakuturu583 Feb 6, 2025
bccbfef
add white line at EoF
hakuturu583 Feb 6, 2025
768e62d
add white line at EoF
hakuturu583 Feb 6, 2025
425aa08
add white line at EoF
hakuturu583 Feb 6, 2025
855d679
add white line at EoF
hakuturu583 Feb 6, 2025
c3489bc
fix lint error
hakuturu583 Feb 6, 2025
d05afea
fix typo
hakuturu583 Feb 6, 2025
71c3429
fix custom_spell.json
hakuturu583 Feb 6, 2025
1f546d1
fix typo
hakuturu583 Feb 6, 2025
e41341f
fix typo
hakuturu583 Feb 6, 2025
48d6845
added new package of context_gamma_scenario
curious-jp Feb 6, 2025
39b8d0f
Merge remote-tracking branch 'origin/master' into feature/context_gamma
hakuturu583 Feb 10, 2025
1db71d1
Merge branch 'feature/context_gamma' of https://github.com/tier4/scen…
hakuturu583 Feb 10, 2025
87a99e8
fix typo
hakuturu583 Feb 10, 2025
d41de79
add map
hakuturu583 Feb 10, 2025
6ff8b3f
bump package version
hakuturu583 Feb 10, 2025
504ae18
modify package version
hakuturu583 Feb 10, 2025
1f8227d
fix compile error in stop_at_crosswalk scenario
hakuturu583 Feb 10, 2025
8a76a41
fix compile erro in spawn function
hakuturu583 Feb 10, 2025
d57f925
port API
hakuturu583 Feb 10, 2025
32df61a
port reverse_walk_at_road scenario
hakuturu583 Feb 10, 2025
3cb555c
port pedestrian_follow_lane scenario
hakuturu583 Feb 10, 2025
9b42150
port stop_line_running scenario
hakuturu583 Feb 10, 2025
f9c2f7c
port traffic_light_running scenario
hakuturu583 Feb 10, 2025
5d9daa9
port head_on_pedestrian scenario
hakuturu583 Feb 10, 2025
194629a
port adaptive_cruise scenario
hakuturu583 Feb 10, 2025
215ccba
port follow_trajectory scenario
hakuturu583 Feb 10, 2025
6ae1b72
port follow_trajectory_closed scenario
hakuturu583 Feb 10, 2025
1971de7
port lane_change_time scenario
hakuturu583 Feb 10, 2025
ccca856
port lane_change_lateral scenario
hakuturu583 Feb 10, 2025
7d12227
port lane_change_longitudinal scenario
hakuturu583 Feb 10, 2025
e3b9c69
port follow_trajectory_dynamic_constraints scenario
hakuturu583 Feb 10, 2025
7d1ce9b
port road_end scenario
hakuturu583 Feb 10, 2025
cd6f53d
fix cmake
hakuturu583 Feb 10, 2025
4b85d7d
fix runtime error
hakuturu583 Feb 10, 2025
d3436b9
Refactor scenario class name and method name for getting distance to …
curious-jp Feb 12, 2025
0827001
add depends
hakuturu583 Feb 13, 2025
6f01766
Merge branch 'master' of https://github.com/tier4/scenario_simulator_…
hakuturu583 Feb 13, 2025
28c74b4
apply reformat
hakuturu583 Feb 13, 2025
b7b5e3e
update package version
hakuturu583 Feb 13, 2025
13a9a01
update python version
hakuturu583 Feb 13, 2025
65b32a1
modify port
hakuturu583 Feb 13, 2025
871980e
change API usage
hakuturu583 Feb 13, 2025
d2bdac2
set altitude
hakuturu583 Feb 14, 2025
0b38186
update lane matching logic
hakuturu583 Feb 14, 2025
d87fe67
extend timeout
hakuturu583 Feb 14, 2025
f398228
fix head_on_pedestrian scenrio
hakuturu583 Feb 14, 2025
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
19 changes: 17 additions & 2 deletions .github/workflows/custom_spell.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,56 @@
"DBUILD",
"denormalize",
"denormalized",
"Dinesh",
"DWITH_INTEGRATION_TEST",
"engageable",
"euclidian",
"gcda",
"gcno",
"gcovr",
"Kotaro",
"libunwind",
"linelint",
"localca",
"Manocha",
"Mersenne",
"Monic",
"Moszynski",
"npcs",
"NSPACES",
"Obst",
"okta",
"oktas",
"oneof",
"parametersetaction",
"Parapura",
"Petrich",
"piotr",
"PLANNE",
"pluggable",
"PREDEF",
"protos",
"pyproject",
"randomizer",
"randomizers",
"roadmaps",
"RVOSIMULATOR",
"Snape",
"sonarcloud",
"sonarqube",
"subspline",
"Szymon",
"TESTRANDOMIZER",
"nextgoal",
"goalposes",
"travelling",
"Tschirnhaus",
"VISUALIZEMARKER",
"walltime",
"whatsnew",
"xcodeproj",
"xerces",
"xercesc",
"Szymon",
"Parapura"
"Yoshimoto"
]
}
47 changes: 47 additions & 0 deletions mock/context_gamma_scenarios/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
cmake_minimum_required(VERSION 3.5)
project(context_gamma_scenarios)

# 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()

add_definitions("-DBOOST_ALLOW_DEPRECATED_HEADERS")

# find dependencies
find_package(ament_cmake_auto REQUIRED)
include(FindProtobuf REQUIRED)

ament_auto_find_build_dependencies()

option(BUILD_CPP_MOCK_SCENARIOS "Building the C++ scenarios" OFF)
if(BUILD_CPP_MOCK_SCENARIOS)
add_subdirectory(src/context_gamma_planner)

endif()

install(
DIRECTORY launch rviz
DESTINATION share/${PROJECT_NAME})
install(
FILES cmake/add_context_gamma_scenario_test.cmake
DESTINATION share/${PROJECT_NAME}/cmake)

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

include(cmake/add_context_gamma_scenario_test.cmake)
# add_context_gamma_scenario_test(${PROJECT_NAME} "traffic_simulation_context_gamma_demo" "70")
endif()

ament_auto_package(CONFIG_EXTRAS "${PROJECT_NAME}_ament_cmake-extras.cmake")
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Copyright 2021 TIER IV, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

find_package(ament_cmake_test REQUIRED)
#
# Add a launch test
#
# :param scenario: name of the scenario you want to run
function(add_context_gamma_scenario_test package_name scenario timeout)
set(cmd
"ros2"
"launch"
"context_gamma_scenarios"
"mock_test.launch.py"
"package:=${package_name}"
"scenario:=${scenario}"
"timeout:=${timeout}"
"junit_path:=${CMAKE_BINARY_DIR}/test_results/${package_name}/${package_name}_${scenario}.xunit.xml"
)

ament_add_test(
"${package_name}_${scenario}"
COMMAND ${cmd}
OUTPUT_FILE "${CMAKE_BINARY_DIR}/test_results/${package_name}/${package_name}_${scenario}.output.txt"
RESULT_FILE "${CMAKE_BINARY_DIR}/test_results/${package_name}/${package_name}_${scenario}.xunit.xml"
TIMEOUT "180"
)
endfunction()
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2021 TIER IV, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

find_package(ament_cmake_test REQUIRED)

include("${context_gamma_scenarios_DIR}/add_context_gamma_scenario_test.cmake")
Loading
Loading