Skip to content

Commit

Permalink
Merge branch 'master' into RJD-1495/fix
Browse files Browse the repository at this point in the history
  • Loading branch information
robomic authored Jan 22, 2025
2 parents a826c10 + fa9ca06 commit d66daca
Show file tree
Hide file tree
Showing 92 changed files with 826 additions and 377 deletions.
13 changes: 13 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
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.4.5</version>
<version>7.4.7</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
13 changes: 13 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions common/simple_junit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
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.4.5</version>
<version>7.4.7</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
13 changes: 13 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions external/concealer/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package concealer
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion external/concealer/package.xml
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.4.5</version>
<version>7.4.7</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
13 changes: 13 additions & 0 deletions external/embree_vendor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@ Changelog for package embree_vendor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion external/embree_vendor/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>vendor packages for intel raytracing kernel library</description>
<maintainer email="[email protected]">masaya</maintainer>
<license>Apache 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions map/kashiwanoha_map/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package kashiwanoha_map
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion map/kashiwanoha_map/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>map package for kashiwanoha</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions map/simple_cross_map/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ Changelog for package simple_cross_map
* Merge branch 'master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion map/simple_cross_map/package.xml
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.4.5</version>
<version>7.4.7</version>
<description>map package for simple cross</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions mock/cpp_mock_scenarios/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package cpp_mock_scenarios
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion mock/cpp_mock_scenarios/package.xml
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>cpp_mock_scenarios</name>
<version>7.4.5</version>
<version>7.4.7</version>
<description>C++ mock scenarios</description>
<maintainer email="[email protected]">masaya</maintainer>
<license>Apache License 2.0</license>
Expand Down
13 changes: 13 additions & 0 deletions openscenario/openscenario_experimental_catalog/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ Changelog for package openscenario_experimental_catalog
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
2 changes: 1 addition & 1 deletion openscenario/openscenario_experimental_catalog/package.xml
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>openscenario_experimental_catalog</name>
<version>7.4.5</version>
<version>7.4.7</version>
<description>TIER IV experimental catalogs for OpenSCENARIO</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
19 changes: 19 additions & 0 deletions openscenario/openscenario_interpreter/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,25 @@ Changelog for package openscenario_interpreter
* add publish_empty_context parameter
* Contributors: Masaya Kataoka

7.4.7 (2025-01-20)
------------------
* Merge branch 'master' into RJD-1511/bug_fix
* Bump version of scenario_simulator_v2 from version 7.4.5 to version 7.4.6
* Merge pull request `#1504 <https://github.com/tier4/scenario_simulator_v2/issues/1504>`_ from tier4/refactor/parameter_value_distribution
* Merge branch 'master' into RJD-1511/bug_fix
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* chore: update xsd comments to OpenSCENARIO XML 1.3.1
* chore: fix include guards
* Contributors: Kotaro Yoshimoto, Michał Ciasnocha, Release Bot

* Merge pull request `#1504 <https://github.com/tier4/scenario_simulator_v2/issues/1504>`_ from tier4/refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* Merge branch 'master' into refactor/parameter_value_distribution
* chore: update xsd comments to OpenSCENARIO XML 1.3.1
* chore: fix include guards
* Contributors: Kotaro Yoshimoto

7.4.6 (2025-01-10)
------------------
* Merge remote-tracking branch 'origin/master' into dependabot/pip/jinja2-3.1.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OPENSCENARIO_INTERPRETER__EXPRESSION__ATTRIBUTE_HPP_
#define OPENSCENARIO_INTERPRETER__EXPRESSION__ATTRIBUTE_HPP_
#ifndef OPENSCENARIO_INTERPRETER__READER__EVALUATE_HPP_
#define OPENSCENARIO_INTERPRETER__READER__EVALUATE_HPP_

#include <iomanip>
#include <openscenario_interpreter/object.hpp>
Expand All @@ -33,4 +33,4 @@ std::string evaluate(const std::string &, const Scope &);
} // namespace reader
} // namespace openscenario_interpreter

#endif // OPENSCENARIO_INTERPRETER__EXPRESSION__ATTRIBUTE_HPP_
#endif // OPENSCENARIO_INTERPRETER__READER__EVALUATE_HPP_
Loading

0 comments on commit d66daca

Please sign in to comment.