Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/canonicalize_fu…
Browse files Browse the repository at this point in the history 
…nction
  • Loading branch information
@hakuturu583
hakuturu583 committed Dec 23, 2024
2 parents e8db59a + 5a45ec9 commit a0a075b
Show file tree
Hide file tree
Showing 74 changed files with 748 additions and 132 deletions.
15 changes: 15 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions common/math/geometry/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_simulator_exception</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions common/simple_junit/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_junit</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
Expand Down
15 changes: 15 additions & 0 deletions common/status_monitor/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>status_monitor</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions external/concealer/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package concealer
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge pull request `#1488 <https://github.com/tier4/scenario_simulator_v2/issues/1488>`_ from tier4/refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion external/concealer/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>concealer</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator.</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions external/embree_vendor/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ Changelog for package embree_vendor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion external/embree_vendor/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>embree_vendor</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>vendor packages for intel raytracing kernel library</description>
<maintainer email="[email protected]">masaya</maintainer>
<license>Apache 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions map/kashiwanoha_map/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ Changelog for package kashiwanoha_map
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion map/kashiwanoha_map/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>kashiwanoha_map</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>map package for kashiwanoha</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
15 changes: 15 additions & 0 deletions map/simple_cross_map/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@ Changelog for package simple_cross_map
* Merge branch 'master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
2 changes: 1 addition & 1 deletion map/simple_cross_map/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_cross_map</name>
<version>7.3.5</version>
<version>7.4.0</version>
<description>map package for simple cross</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
32 changes: 32 additions & 0 deletions mock/cpp_mock_scenarios/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,38 @@ Changelog for package cpp_mock_scenarios
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.0 (2024-12-23)
------------------
* Merge pull request `#1464 <https://github.com/tier4/scenario_simulator_v2/issues/1464>`_ from tier4/RJD-1457/traffic_sink_refactor
RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* style fix
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* code style
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* sink pedestrian test fix
* simplify auto_sink logic
* TrafficSinkConfig
* AutoSinkConfig
* review suggestions
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' into RJD-1457/traffic_sink_refactor
* TrafficSink refactor with despawn functionality
* Merge tag '6.0.1' into RJD-1457/traffic_sink_refactor
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/enable_specify_entity_type_in_autosink
* fix check condition
* Merge branch 'master' into feature/enable_specify_entity_type_in_autosink
* use uint8_t instead of traffic_simulator_msgs::msg::EntityType
* remap debug marker
* modify launch file
* add testcase for autosink
* enable sink vehicle
* enable set traffic sink in cpp scenario
* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic

7.3.5 (2024-12-20)
------------------
* Merge branch 'master' into refactor/concealer-1
Expand Down
3 changes: 2 additions & 1 deletion mock/cpp_mock_scenarios/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ if(BUILD_CPP_MOCK_SCENARIOS)
add_subdirectory(src/random_scenario)
add_subdirectory(src/spawn)
add_subdirectory(src/speed_planning)
add_subdirectory(src/traffic_source)
add_subdirectory(src/synchronized_action)
add_subdirectory(src/traffic_sink)
add_subdirectory(src/traffic_source)
# add_subdirectory(src/respawn_ego)

endif()
Expand Down
7 changes: 5 additions & 2 deletions mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class CppScenarioNode : public rclcpp::Node
explicit CppScenarioNode(
const std::string & node_name, const std::string & map_path,
const std::string & lanelet2_map_file, const std::string & scenario_filename,
const bool verbose, const rclcpp::NodeOptions & option);
const bool verbose, const rclcpp::NodeOptions & option,
const std::set<std::uint8_t> & auto_sink_entity_types = {});
void start();
void stop(Result result, const std::string & description = "");
void expectThrow() { exception_expect_ = true; }
Expand Down Expand Up @@ -71,14 +72,16 @@ class CppScenarioNode : public rclcpp::Node
int timeout_;
auto configure(
const std::string & map_path, const std::string & lanelet2_map_file,
const std::string & scenario_filename, const bool verbose) -> traffic_simulator::Configuration
const std::string & scenario_filename, const bool verbose,
const std::set<std::uint8_t> & auto_sink_entity_types = {}) -> traffic_simulator::Configuration
{
auto configuration = traffic_simulator::Configuration(map_path);
{
configuration.lanelet2_map_file = lanelet2_map_file;
// configuration.lanelet2_map_file = "lanelet2_map_with_private_road_and_walkway_ele_fix.osm";
configuration.scenario_path = scenario_filename;
configuration.verbose = verbose;
configuration.auto_sink_entity_types = auto_sink_entity_types;
}
checkConfiguration(configuration);
return configuration;
Expand Down
Loading

0 comments on commit a0a075b

Please sign in to comment.