Skip to content

Commit 0fb9b2a

Browse files
Removed logging
Signed-off-by: Arjun Jagdish Ram <arjun.ram@tier4.jp>
1 parent b9a97af commit 0fb9b2a

File tree

2 files changed

+21
-61
lines changed

2 files changed

+21
-61
lines changed

planning/autoware_path_optimizer/src/mpt_optimizer.cpp

-39
Original file line numberDiff line numberDiff line change
@@ -529,17 +529,6 @@ std::pair<std::vector<TrajectoryPoint>, int> MPTOptimizer::optimizeTrajectory(
529529
const auto optimized_variables = calcOptimizedSteerAngles(ref_points, obj_mat, const_mat);
530530
if (!optimized_variables) {
531531
RCLCPP_WARN(logger_, "return std::nullopt since could not solve qp");
532-
RCLCPP_INFO(logger_, "Inputs causing failure:");
533-
RCLCPP_INFO_STREAM(logger_, "ref_points: ");
534-
535-
for (const auto & ref_point : ref_points) {
536-
std::cout << "\t" << ref_point << "\n";
537-
}
538-
539-
RCLCPP_INFO_STREAM(logger_, "mpt_mat: " << mpt_mat);
540-
RCLCPP_INFO_STREAM(logger_, "val_mat: " << val_mat);
541-
RCLCPP_INFO_STREAM(logger_, "obj_mat: " << obj_mat);
542-
RCLCPP_INFO_STREAM(logger_, "const_mat: " << const_mat);
543532

544533
return std::make_pair(get_prev_optimized_traj_points(), -1);
545534
}
@@ -1561,19 +1550,6 @@ std::optional<Eigen::VectorXd> MPTOptimizer::calcOptimizedSteerAngles(
15611550
const int status_polish = osqp_result.polish_status;
15621551
const int exit_flag = osqp_result.exit_flag;
15631552

1564-
RCLCPP_INFO(logger_, "optimization failed: result contains NaN values");
1565-
RCLCPP_INFO(logger_, "Problem details:");
1566-
RCLCPP_INFO_STREAM(logger_, "P_csc: " << P_csc);
1567-
RCLCPP_INFO_STREAM(logger_, "f: " << vectorToString(f));
1568-
RCLCPP_INFO_STREAM(logger_, "A_csc: " << A_csc);
1569-
RCLCPP_INFO_STREAM(logger_, "lower_bound: " << vectorToString(lower_bound));
1570-
RCLCPP_INFO_STREAM(logger_, "upper_bound: " << vectorToString(upper_bound));
1571-
RCLCPP_INFO(logger_, "Solver details:");
1572-
RCLCPP_INFO_STREAM(logger_, "lagrange_multiplier: " << vectorToString(lagrange_multiplier));
1573-
RCLCPP_INFO_STREAM(logger_, "status_polish: " << status_polish);
1574-
RCLCPP_INFO_STREAM(logger_, "solution_status: " << solution_status);
1575-
RCLCPP_INFO_STREAM(logger_, "exit_flag: " << exit_flag);
1576-
15771553
osqp_solver_ptr_->logUnsolvedStatus("[MPT]");
15781554
return std::nullopt;
15791555
}
@@ -1594,21 +1570,6 @@ std::optional<Eigen::VectorXd> MPTOptimizer::calcOptimizedSteerAngles(
15941570
const int status_polish = osqp_result.polish_status;
15951571
const int exit_flag = osqp_result.exit_flag;
15961572

1597-
RCLCPP_INFO(logger_, "optimization failed: result contains NaN values");
1598-
RCLCPP_INFO(logger_, "Problem details:");
1599-
RCLCPP_INFO_STREAM(logger_, "P_csc: " << P_csc);
1600-
RCLCPP_INFO_STREAM(logger_, "f: " << vectorToString(f));
1601-
RCLCPP_INFO_STREAM(logger_, "A_csc: " << A_csc);
1602-
RCLCPP_INFO_STREAM(logger_, "lower_bound: " << vectorToString(lower_bound));
1603-
RCLCPP_INFO_STREAM(logger_, "upper_bound: " << vectorToString(upper_bound));
1604-
RCLCPP_INFO(logger_, "Solver details:");
1605-
RCLCPP_INFO_STREAM(logger_, "optimization_result: " << vectorToString(optimization_result));
1606-
RCLCPP_INFO_STREAM(logger_, "lagrange_multiplier: " << vectorToString(lagrange_multiplier));
1607-
RCLCPP_INFO_STREAM(logger_, "status_polish: " << status_polish);
1608-
RCLCPP_INFO_STREAM(logger_, "solution_status: " << solution_status);
1609-
RCLCPP_INFO_STREAM(logger_, "iteration_status: " << iteration_status);
1610-
RCLCPP_INFO_STREAM(logger_, "exit_flag: " << exit_flag);
1611-
16121573
return std::nullopt;
16131574
}
16141575
const Eigen::VectorXd optimized_variables =

system/autoware_system_diagnostic_monitor/config/autoware-main.yaml

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
files:
2-
- { path: $(dirname)/control.yaml }
3-
- { path: $(dirname)/localization.yaml }
42
- { path: $(dirname)/map.yaml }
5-
- { path: $(dirname)/perception.yaml }
3+
- { path: $(dirname)/localization.yaml }
64
- { path: $(dirname)/planning.yaml }
7-
- { path: $(dirname)/system.yaml }
5+
- { path: $(dirname)/perception.yaml }
6+
- { path: $(dirname)/control.yaml }
87
- { path: $(dirname)/vehicle.yaml }
8+
- { path: $(dirname)/system.yaml }
99

1010
units:
11+
- path: /autoware/modes/stop
12+
type: ok
13+
14+
- path: /autoware/modes/autonomous
15+
type: and
16+
list:
17+
- { type: link, link: /autoware/map }
18+
- { type: link, link: /autoware/localization }
19+
- { type: link, link: /autoware/planning }
20+
- { type: link, link: /autoware/perception }
21+
- { type: link, link: /autoware/control }
22+
- { type: link, link: /autoware/vehicle }
23+
- { type: link, link: /autoware/system }
24+
1125
- path: /autoware/modes/local
1226
type: and
1327
list:
@@ -22,21 +36,13 @@ units:
2236
- { type: link, link: /autoware/system }
2337
- { type: link, link: /autoware/control/remote }
2438

25-
- path: /autoware/modes/stop
26-
type: ok
27-
28-
- path: /autoware/modes/autonomous
39+
- path: /autoware/modes/emergency_stop
2940
type: and
3041
list:
31-
- { type: link, link: /autoware/map }
32-
- { type: link, link: /autoware/localization }
33-
- { type: link, link: /autoware/planning }
34-
- { type: link, link: /autoware/perception }
35-
- { type: link, link: /autoware/control }
3642
- { type: link, link: /autoware/vehicle }
3743
- { type: link, link: /autoware/system }
3844

39-
- path: /autoware/modes/pull_over
45+
- path: /autoware/modes/comfortable_stop
4046
type: and
4147
list:
4248
- { type: link, link: /autoware/map }
@@ -47,7 +53,7 @@ units:
4753
- { type: link, link: /autoware/vehicle }
4854
- { type: link, link: /autoware/system }
4955

50-
- path: /autoware/modes/comfortable_stop
56+
- path: /autoware/modes/pull_over
5157
type: and
5258
list:
5359
- { type: link, link: /autoware/map }
@@ -58,13 +64,6 @@ units:
5864
- { type: link, link: /autoware/vehicle }
5965
- { type: link, link: /autoware/system }
6066

61-
- path: /autoware/modes/emergency_stop
62-
type: and
63-
list:
64-
- { type: link, link: /autoware/planning }
65-
- { type: link, link: /autoware/system }
66-
- { type: link, link: /autoware/vehicle }
67-
6867
- path: /autoware/debug/tools
6968
type: and
7069
list:

0 commit comments

Comments
 (0)