提交 fc705abd 编写于 作者: D Dong Li 提交者: Liangliang Zhang

perception: fix breaked build

上级 02257e22
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "modules/perception/fusion/lib/data_association/hm_data_association/hm_tracks_objects_match.h" #include "modules/perception/fusion/lib/data_association/hm_data_association/hm_tracks_objects_match.h"
#include <gtest/gtest.h> #include "gtest/gtest.h"
#include "modules/perception/base/frame.h" #include "modules/perception/base/frame.h"
#include "modules/perception/common/sensor_manager/sensor_manager.h" #include "modules/perception/common/sensor_manager/sensor_manager.h"
...@@ -170,8 +170,8 @@ TEST(MatcherTest, test_all) { ...@@ -170,8 +170,8 @@ TEST(MatcherTest, test_all) {
EXPECT_FLOAT_EQ(association_mat[2][1], 4.0); EXPECT_FLOAT_EQ(association_mat[2][1], 4.0);
unassigned_tracks.clear(); unassigned_tracks.clear();
unassigned_measurements.clear(); unassigned_measurements.clear();
std::vector<TrackMeasurmentPair> assignments; std::vector<TrackMeasurmentPair> assignments;
//test id assign with do_nothing equals to true //test id assign with do_nothing equals to true
matcher.IdAssign(fusion_tracks, sensor_objects, &assignments, matcher.IdAssign(fusion_tracks, sensor_objects, &assignments,
&unassigned_tracks, &unassigned_measurements, true); &unassigned_tracks, &unassigned_measurements, true);
EXPECT_EQ(0, assignments.size()); EXPECT_EQ(0, assignments.size());
......
...@@ -11,14 +11,14 @@ cc_library( ...@@ -11,14 +11,14 @@ cc_library(
"pbf_gatekeeper.h", "pbf_gatekeeper.h",
], ],
deps = [ deps = [
"//modules/perception/fusion/lib/interface:interface", "//modules/common/util",
"//modules/perception/fusion/base:base_init_options", "//modules/perception/fusion/base:base_init_options",
"//modules/perception/fusion/lib/gatekeeper/pbf_gatekeeper/proto:pbf_gatekeeper_config_proto",
"//modules/perception/lib/config_manager:config_manager",
"//modules/perception/lib/io:file_util",
"//modules/perception/lib/io:protobuf_util",
"//modules/perception/fusion/base:scene", "//modules/perception/fusion/base:scene",
"//modules/perception/fusion/base:track", "//modules/perception/fusion/base:track",
"//modules/perception/fusion/lib/gatekeeper/pbf_gatekeeper/proto:pbf_gatekeeper_config_proto",
"//modules/perception/fusion/lib/interface",
"//modules/perception/lib/config_manager",
"//modules/perception/lib/io:file_util",
], ],
) )
...@@ -29,11 +29,11 @@ cc_test( ...@@ -29,11 +29,11 @@ cc_test(
"pbf_gatekeeper_test.cc", "pbf_gatekeeper_test.cc",
], ],
deps = [ deps = [
"@gtest//:main",
":pbf_gatekeeper", ":pbf_gatekeeper",
"//modules/perception/common/sensor_manager:sensor_manager", "//modules/perception/common/sensor_manager",
"//modules/perception/fusion/base:sensor", "//modules/perception/fusion/base:sensor",
"//modules/perception/fusion/base:track", "//modules/perception/fusion/base:track",
"@gtest//:main",
], ],
) )
......
...@@ -48,8 +48,8 @@ bool PbfGatekeeper::Init() { ...@@ -48,8 +48,8 @@ bool PbfGatekeeper::Init() {
lib::FileUtil::GetAbsolutePath(woork_root_config, options.conf_file); lib::FileUtil::GetAbsolutePath(woork_root_config, options.conf_file);
PbfGatekeeperConfig params; PbfGatekeeperConfig params;
if (!apollo::common::util::GetProtoFromFile<PbfGatekeeperConfig>( if (!apollo::common::util::GetProtoFromFile<PbfGatekeeperConfig>(config,
config, &params)) { &params)) {
AERROR << "Read config failed: " << config; AERROR << "Read config failed: " << config;
return false; return false;
} }
...@@ -100,7 +100,8 @@ bool PbfGatekeeper::AbleToPublish(const TrackPtr &track) { ...@@ -100,7 +100,8 @@ bool PbfGatekeeper::AbleToPublish(const TrackPtr &track) {
track->AddTrackedTimes(); track->AddTrackedTimes();
if (params_.use_track_time_pub_strategy && if (params_.use_track_time_pub_strategy &&
track->GetTrackedTimes() <= params_.pub_track_time_thresh) { track->GetTrackedTimes() <=
static_cast<size_t>(params_.pub_track_time_thresh)) {
return false; return false;
} }
return true; return true;
...@@ -164,11 +165,11 @@ bool PbfGatekeeper::RadarAbleToPublish(const TrackPtr &track, bool is_night) { ...@@ -164,11 +165,11 @@ bool PbfGatekeeper::RadarAbleToPublish(const TrackPtr &track, bool is_night) {
// } // }
// } // }
} else if (radar_object->GetSensorId() == "radar_rear") { } else if (radar_object->GetSensorId() == "radar_rear") {
ADEBUG << "radar_rear: min_dis: " ADEBUG << "radar_rear: min_dis: " << params_.min_radar_confident_distance
<< params_.min_radar_confident_distance << " obj dist: " << " obj dist: "
<< radar_object->GetBaseObject()->radar_supplement.range << radar_object->GetBaseObject()->radar_supplement.range
<< " track_id: " << track->GetTrackId() << " track_id: " << track->GetTrackId()
<< " exist_prob: " << track->GetExistanceProb(); << " exist_prob: " << track->GetExistanceProb();
if (radar_object->GetBaseObject()->radar_supplement.range > if (radar_object->GetBaseObject()->radar_supplement.range >
params_.min_radar_confident_distance && params_.min_radar_confident_distance &&
(radar_object->GetBaseObject()->velocity.norm() > 4.0 || (radar_object->GetBaseObject()->velocity.norm() > 4.0 ||
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册