Commit 6ed1a7ee authored by wangdawei's avatar wangdawei

test

parent a0457f09
...@@ -382,7 +382,9 @@ void FastVoxelMatcher::ScoreCandidates(const VoxelMap &voxel_map, ...@@ -382,7 +382,9 @@ void FastVoxelMatcher::ScoreCandidates(const VoxelMap &voxel_map,
no_map_cnt++; no_map_cnt++;
} }
} }
LOG(INFO) << "grid_indexes: " << candidates->front().scan->grid_indexes.size() << ", no_map_cnt: " << no_map_cnt; LOG(INFO) << "search_depth: " << candidates->front().search_depth
<< " grid_indexes: " << candidates->front().scan->grid_indexes.size()
<< ", no_map_cnt: " << no_map_cnt;
} }
if (0 != no_map_cnt) { if (0 != no_map_cnt) {
float multi = (float)candidates->front().scan->grid_indexes.size() / float multi = (float)candidates->front().scan->grid_indexes.size() /
......
...@@ -46,7 +46,6 @@ inline float fast_match(FastVoxelMatcher *matcher, const VoxelMap *map, const Fa ...@@ -46,7 +46,6 @@ inline float fast_match(FastVoxelMatcher *matcher, const VoxelMap *map, const Fa
if (result != NULL) { if (result != NULL) {
estimate_pose = result->pose_estimate.cast<double>(); estimate_pose = result->pose_estimate.cast<double>();
LOG(INFO) << "estimate_pose.translation(): " << estimate_pose.translation().transpose();
#ifdef VOXEL_MAP_DEBUG #ifdef VOXEL_MAP_DEBUG
char buf[200]; char buf[200];
// add by weiji: Trans from estimate to predict // add by weiji: Trans from estimate to predict
......
...@@ -382,10 +382,12 @@ bool AdjustPPK::LocateCloud(const CloudInfoForMatch &cloudInfo) ...@@ -382,10 +382,12 @@ bool AdjustPPK::LocateCloud(const CloudInfoForMatch &cloudInfo)
GnssPoint finalGnssPose; GnssPoint finalGnssPose;
GuessPose guessPose; GuessPose guessPose;
guessPose.map_point = mapPose_; guessPose.map_point = mapPose_;
auto increaseRpy = RotationQuaternionToEulerVector( // auto increaseRpy = RotationQuaternionToEulerVector(
Quaterniond(cloudInfo.filterPoseInfo.increasePose.linear())); // Quaterniond(cloudInfo.filterPoseInfo.increasePose.linear()));
guessPose.movement = cloudInfo.filterPoseInfo.increasePose.translation().norm(); // guessPose.movement = cloudInfo.filterPoseInfo.increasePose.translation().norm();
guessPose.rotation = fabs(increaseRpy.z()); // guessPose.rotation = fabs(increaseRpy.z());
guessPose.movement = 0.6;
guessPose.rotation = 0.003;
guessPose.use_gnss = false; guessPose.use_gnss = false;
if(!currMatcher_->IsMapLoaded(mapPose_.translation())){ if(!currMatcher_->IsMapLoaded(mapPose_.translation())){
currMatcher_->loadArea(mapPose_.translation()); currMatcher_->loadArea(mapPose_.translation());
...@@ -484,10 +486,10 @@ bool AdjustPPK::LoadMesh(const string &streamPath, boost::shared_ptr<VoxelMapMat ...@@ -484,10 +486,10 @@ bool AdjustPPK::LoadMesh(const string &streamPath, boost::shared_ptr<VoxelMapMat
LOG(INFO) << "mesh to load: " << streamPath; LOG(INFO) << "mesh to load: " << streamPath;
VoxelMapMatcherOption option; VoxelMapMatcherOption option;
option.option.filter_resolution = 1.0; option.option.filter_resolution = 1.2;
option.option.cloud_range = 80; option.option.cloud_range = 80;
option.fast_option.accepted_score = 0.35; option.fast_option.accepted_score = 0.4;
option.fast_option.accepted_low_score = 0.45; option.fast_option.accepted_low_score = 0.5;
matcher.reset(new VoxelMapMatcher(option)); matcher.reset(new VoxelMapMatcher(option));
matcher->SetMapPath(streamPath); matcher->SetMapPath(streamPath);
return true; return true;
......
...@@ -270,7 +270,6 @@ void MeshArea::loadBlockAtArea(const Vector3d &position) ...@@ -270,7 +270,6 @@ void MeshArea::loadBlockAtArea(const Vector3d &position)
uint16_t blockCntLoaded = 0; uint16_t blockCntLoaded = 0;
Vector2i centerIndex = Vector2i centerIndex =
calShiftedIndex(position.x(), position.y()); calShiftedIndex(position.x(), position.y());
LOG(INFO) << "shiftedIndexToLoad: " << centerIndex.transpose();
vector<Vector2i> neighbors; vector<Vector2i> neighbors;
if(fstLoadMap){ if(fstLoadMap){
neighbors = firstLoadNeighbors_; neighbors = firstLoadNeighbors_;
...@@ -324,7 +323,8 @@ void MeshArea::loadBlockAtArea(const Vector3d &position) ...@@ -324,7 +323,8 @@ void MeshArea::loadBlockAtArea(const Vector3d &position)
blockContent.blockState = Empty; blockContent.blockState = Empty;
} }
} }
LOG(INFO) << "blockCntLoaded: " <<blockCntLoaded; // LOG(INFO) << "shiftedIndexToLoad: " << centerIndex.transpose()
// << " blockCntLoaded: " <<blockCntLoaded;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment