Merge branch 'master' into RJD-1511/bug_fix

tier4 · Jan 17, 2025 · ee61ede · ee61ede
2 parents 42422e9 + 326fba4
commit ee61ede
Show file tree

Hide file tree

Showing 91 changed files with 614 additions and 377 deletions.
diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package arithmetic
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml
@@ -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.6</version>
   <description>arithmetic library for scenario_simulator_v2</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package geometry
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml
@@ -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.6</version>
   <description>geometry math library for scenario_simulator_v2 application</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package scenario_simulator_exception
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml
@@ -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.6</version>
   <description>Exception types for scenario simulator</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package junit_exporter
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml
@@ -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.6</version>
   <description>Lightweight JUnit library for ROS 2</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>

diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package status_monitor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml
@@ -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.6</version>
   <description>none</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package concealer
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/external/concealer/package.xml b/external/concealer/package.xml
@@ -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.6</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>

diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst
@@ -24,6 +24,12 @@ Changelog for package embree_vendor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml
@@ -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.6</version>
   <description>vendor packages for intel raytracing kernel library</description>
   <maintainer email="[email protected]">masaya</maintainer>
   <license>Apache 2.0</license>

diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package kashiwanoha_map
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml
@@ -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.6</version>
   <description>map package for kashiwanoha</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/map/simple_cross_map/CHANGELOG.rst b/map/simple_cross_map/CHANGELOG.rst
@@ -9,6 +9,12 @@ Changelog for package simple_cross_map
 * Merge branch 'master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml
@@ -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.6</version>
   <description>map package for simple cross</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package cpp_mock_scenarios
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml
@@ -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.6</version>
   <description>C++ mock scenarios</description>
   <maintainer email="[email protected]">masaya</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package openscenario_experimental_catalog
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml
@@ -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.6</version>
   <description>TIER IV experimental catalogs for OpenSCENARIO</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst
@@ -32,6 +32,15 @@ Changelog for package openscenario_interpreter
 * add publish_empty_context parameter
 * Contributors: Masaya Kataoka
 
+Forthcoming
+-----------
+* 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

diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/reader/evaluate.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/reader/evaluate.hpp
@@ -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>
@@ -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_
diff --git a/...enario/openscenario_interpreter/include/openscenario_interpreter/syntax/deterministic.hpp b/...enario/openscenario_interpreter/include/openscenario_interpreter/syntax/deterministic.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OPENSCENARIO_INTERPRETER__DETERMINISTIC_HPP_
-#define OPENSCENARIO_INTERPRETER__DETERMINISTIC_HPP_
+#ifndef OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_HPP_
+#define OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_HPP_
 
 #include <openscenario_interpreter/scope.hpp>
 #include <openscenario_interpreter/syntax/deterministic_parameter_distribution.hpp>
@@ -23,15 +23,17 @@ namespace openscenario_interpreter
 {
 inline namespace syntax
 {
-/* ---- Deterministic 1.2 ------------------------------------------------------
- *
- *  <xsd:complexType name="Deterministic">
- *    <xsd:sequence>
- *      <xsd:group ref="DeterministicParameterDistribution" minOccurs="0" maxOccurs="unbounded"/>
- *    </xsd:sequence>
- *  </xsd:complexType>
- *
- * -------------------------------------------------------------------------- */
+/*
+   Deterministic (OpenSCENARIO XML 1.3.1)
+
+   Top level container containing all deterministic distribution elements.
+
+   <xsd:complexType name="Deterministic">
+     <xsd:sequence>
+       <xsd:group ref="DeterministicParameterDistribution" minOccurs="0" maxOccurs="unbounded"/>
+     </xsd:sequence>
+   </xsd:complexType>
+*/
 struct Deterministic
 {
   const std::list<DeterministicParameterDistribution> deterministic_parameter_distributions;
@@ -40,4 +42,4 @@ struct Deterministic
 };
 }  // namespace syntax
 }  // namespace openscenario_interpreter
-#endif  // OPENSCENARIO_INTERPRETER__DETERMINISTIC_HPP_
+#endif  // OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_HPP_
diff --git a/...er/include/openscenario_interpreter/syntax/deterministic_multi_parameter_distribution.hpp b/...er/include/openscenario_interpreter/syntax/deterministic_multi_parameter_distribution.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OPENSCENARIO_INTERPRETER__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_
-#define OPENSCENARIO_INTERPRETER__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_
+#ifndef OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_
+#define OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_
 
 #include <openscenario_interpreter/scope.hpp>
 #include <openscenario_interpreter/syntax/deterministic_multi_parameter_distribution_type.hpp>
@@ -23,19 +23,21 @@ namespace openscenario_interpreter
 {
 inline namespace syntax
 {
-/* ---- DeterministicMultiParameterDistribution 1.2 ----------------------------
- *
- *  <xsd:complexType name="DeterministicMultiParameterDistribution">
- *    <xsd:sequence>
- *      <xsd:group ref="DeterministicMultiParameterDistributionType"/>
- *    </xsd:sequence>
- *  </xsd:complexType>
- *
- * -------------------------------------------------------------------------- */
+/*
+   DeterministicMultiParameterDistribution (OpenSCENARIO XML 1.3.1)
+
+   Container for a deterministic distribution which is applied to multiple parameters.
+
+   <xsd:complexType name="DeterministicMultiParameterDistribution">
+     <xsd:sequence>
+       <xsd:group ref="DeterministicMultiParameterDistributionType"/>
+     </xsd:sequence>
+   </xsd:complexType>
+*/
 struct DeterministicMultiParameterDistribution : public DeterministicMultiParameterDistributionType
 {
   explicit DeterministicMultiParameterDistribution(const pugi::xml_node &, Scope & scope);
 };
 }  // namespace syntax
 }  // namespace openscenario_interpreter
-#endif  // OPENSCENARIO_INTERPRETER__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_
+#endif  // OPENSCENARIO_INTERPRETER__SYNTAX__DETERMINISTIC_MULTI_PARAMETER_DISTRIBUTION_HPP_