Skip to content

Commit

Permalink
Merge branch 'master' into RJD-1489/NpcCenterLine
Browse files Browse the repository at this point in the history
  • Loading branch information
@gmajrobotec
gmajrobotec authored Dec 12, 2024
2 parents c159a38 + 081643a commit 4c776cc
Show file tree
Hide file tree
Showing 135 changed files with 4,007 additions and 917 deletions.
104 changes: 104 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,110 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.0.2 (2024-12-12)
------------------
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Contributors: Masaya Kataoka, Taiga

7.0.1 (2024-12-11)
------------------
* Merge branch 'master' into feature/act-starttrigger-optional
* Merge branch 'master' into feature/act-starttrigger-optional
* Contributors: Kotaro Yoshimoto, ぐるぐる

7.0.0 (2024-12-10)
------------------
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# external/concealer/include/concealer/autoware.hpp
# external/concealer/include/concealer/autoware_universe.hpp
# external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp
# external/concealer/src/autoware_universe.cpp
# external/concealer/src/field_operator_application_for_autoware_universe.cpp
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto
# Conflicts:
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski

6.3.1 (2024-12-10)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Contributors: Masaya Kataoka

6.3.0 (2024-12-10)
------------------
* Merge branch 'master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Contributors: Kotaro Yoshimoto

6.2.5 (2024-12-09)
------------------
* Merge branch 'master' into fix/acc_by_slope
* Contributors: Kotaro Yoshimoto

6.2.4 (2024-12-09)
------------------
* Merge branch 'master' into refactor/speed-condition
* Merge branch 'master' into refactor/speed-condition
* Contributors: Tatsuya Yamasaki

6.2.3 (2024-12-05)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-2
* Contributors: Masaya Kataoka

6.2.2 (2024-12-04)
------------------
* Merge branch 'master' into refactor/distance-condition
* Merge remote-tracking branch 'origin/master' into refactor/distance-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
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>6.2.1</version>
<version>7.0.2</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
109 changes: 109 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,115 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.0.2 (2024-12-12)
------------------
* Merge pull request `#1470 <https://github.com/tier4/scenario_simulator_v2/issues/1470>`_ from tier4/fix/snor-cloud-issue-8-1
Fix/sonor cloud issue 8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Fixed bugs and added comments.
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Merge branch 'master' into fix/snor-cloud-issue-8-1
* Remove the commented out code.
Replace this declaration by a structured binding declaration.
* Contributors: Masaya Kataoka, Taiga, Taiga Takano

7.0.1 (2024-12-11)
------------------
* Merge branch 'master' into feature/act-starttrigger-optional
* Merge branch 'master' into feature/act-starttrigger-optional
* Contributors: Kotaro Yoshimoto, ぐるぐる

7.0.0 (2024-12-10)
------------------
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# external/concealer/include/concealer/autoware.hpp
# external/concealer/include/concealer/autoware_universe.hpp
# external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp
# external/concealer/src/autoware_universe.cpp
# external/concealer/src/field_operator_application_for_autoware_universe.cpp
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto
# Conflicts:
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski

6.3.1 (2024-12-10)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Contributors: Masaya Kataoka

6.3.0 (2024-12-10)
------------------
* Merge branch 'master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Contributors: Kotaro Yoshimoto

6.2.5 (2024-12-09)
------------------
* Merge branch 'master' into fix/acc_by_slope
* Contributors: Kotaro Yoshimoto

6.2.4 (2024-12-09)
------------------
* Merge branch 'master' into refactor/speed-condition
* Merge branch 'master' into refactor/speed-condition
* Contributors: Tatsuya Yamasaki

6.2.3 (2024-12-05)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-2
* Contributors: Masaya Kataoka

6.2.2 (2024-12-04)
------------------
* Merge branch 'master' into refactor/distance-condition
* Merge remote-tracking branch 'origin/master' into refactor/distance-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
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>6.2.1</version>
<version>7.0.2</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
28 changes: 18 additions & 10 deletions common/math/geometry/src/spline/catmull_rom_spline.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ auto CatmullRomSpline::getSquaredDistanceIn2D(
}
return line_segments_[0].getSquaredDistanceIn2D(point, s, true);
default:
const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getSquaredDistanceIn2D(point, index_and_s.second, true);
const auto [index, s_value] = getCurveIndexAndS(s);
return curves_[index].getSquaredDistanceIn2D(point, s_value, true);
}
}

Expand Down Expand Up @@ -508,8 +508,8 @@ auto CatmullRomSpline::getSquaredDistanceVector(
}
return line_segments_[0].getSquaredDistanceVector(point, s, true);
default:
const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getSquaredDistanceVector(point, index_and_s.second, true);
const auto [index, s_value] = getCurveIndexAndS(s);
return curves_[index].getSquaredDistanceVector(point, s_value, true);
}
}

Expand Down Expand Up @@ -542,8 +542,8 @@ auto CatmullRomSpline::getPoint(const double s) const -> geometry_msgs::msg::Poi
}
return line_segments_[0].getPoint(s, true);
default:
const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getPoint(index_and_s.second, true);
const auto [index, s_value] = getCurveIndexAndS(s);
return curves_[index].getPoint(s_value, true);
}
}

Expand Down Expand Up @@ -597,8 +597,8 @@ auto CatmullRomSpline::getNormalVector(const double s) const -> geometry_msgs::m
"This message is not originally intended to be displayed, if you see it, please "
"contact the developer of traffic_simulator.");
default:
const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getNormalVector(index_and_s.second, true);
const auto [index, s_value] = getCurveIndexAndS(s);
return curves_[index].getNormalVector(s_value, true);
}
}

Expand Down Expand Up @@ -634,6 +634,14 @@ auto CatmullRomSpline::getTangentVector(const double s) const -> geometry_msgs::
"This message is not originally intended to be displayed, if you see it, please "
"contact the developer of traffic_simulator.");
default:
/**
* @note The current implementation uses `index_and_s` instead of structured binding
* (`const auto [index, s_value] = getCurveIndexAndS(s)`) because some tests fail
* when using structured binding. The root cause of these test failures is under investigation.
*/
// const auto [index, s_value] = getCurveIndexAndS(s);
// return curves_[index].getTangentVector(s_value, true);

const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getTangentVector(index_and_s.second, true);
}
Expand Down Expand Up @@ -665,8 +673,8 @@ auto CatmullRomSpline::getPose(const double s, const bool fill_pitch) const
}
return line_segments_[0].getPose(s, true, fill_pitch);
default:
const auto index_and_s = getCurveIndexAndS(s);
return curves_[index_and_s.first].getPose(index_and_s.second, true, fill_pitch);
const auto [index, s_value] = getCurveIndexAndS(s);
return curves_[index].getPose(s_value, true, fill_pitch);
}
}

Expand Down
Loading

0 comments on commit 4c776cc

Please sign in to comment.