Merge pull request uzh-rpg#99 from lukeopteran/master

Fixed Eigen assertion error, on Ubuntu 20.04 ROS Noetic, also working on Melodic
W4li8 · Mar 31, 2021 · 3d56cdc · 3d56cdc
2 parents 5161d56 + 808155a
commit 3d56cdc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/source/tutorials_general/racing.cpp b/docs/source/tutorials_general/racing.cpp
@@ -82,8 +82,8 @@ int main(int argc, char *argv[]) {
   std::size_t num_waypoints = way_points.size();
   Eigen::VectorXd segment_times(num_waypoints);
   segment_times << 10.0, 10.0, 10.0, 10.0;
-  Eigen::VectorXd minimization_weights(num_waypoints);
-  minimization_weights << 1.0, 1.0, 1.0, 1.0;
+  Eigen::VectorXd minimization_weights(5);
+  minimization_weights << 0.0, 1.0, 1.0, 1.0, 1.0;
 
   polynomial_trajectories::PolynomialTrajectorySettings trajectory_settings =
     polynomial_trajectories::PolynomialTrajectorySettings(

diff --git a/docs/source/tutorials_general/racing.rst b/docs/source/tutorials_general/racing.rst
@@ -23,8 +23,8 @@ Generate trajectory
   std::size_t num_waypoints = way_points.size();
   Eigen::VectorXd segment_times(num_waypoints);
   segment_times << 10.0, 10.0, 10.0, 10.0;
-  Eigen::VectorXd minimization_weights(num_waypoints);
-  minimization_weights << 1.0, 1.0, 1.0, 1.0;
+  Eigen::VectorXd minimization_weights(5);
+  minimization_weights << 0.0, 1.0, 1.0, 1.0, 1.0;
 
   polynomial_trajectories::PolynomialTrajectorySettings trajectory_settings =
     polynomial_trajectories::PolynomialTrajectorySettings(

diff --git a/flightros/src/racing/racing.cpp b/flightros/src/racing/racing.cpp
@@ -69,8 +69,8 @@ int main(int argc, char *argv[]) {
   std::size_t num_waypoints = way_points.size();
   Eigen::VectorXd segment_times(num_waypoints);
   segment_times << 10.0, 10.0, 10.0, 10.0;
-  Eigen::VectorXd minimization_weights(num_waypoints);
-  minimization_weights << 1.0, 1.0, 1.0, 1.0;
+  Eigen::VectorXd minimization_weights(5);
+  minimization_weights << 0.0, 1.0, 1.0, 1.0, 1.0;
 
   polynomial_trajectories::PolynomialTrajectorySettings trajectory_settings =
     polynomial_trajectories::PolynomialTrajectorySettings(