Commit f077ff06 authored by wangdawei's avatar wangdawei

v1.0

parent 5945288a
...@@ -253,8 +253,10 @@ void AdjustPPK::CalPPKPeriod() ...@@ -253,8 +253,10 @@ void AdjustPPK::CalPPKPeriod()
if(period.startTime > 0){ if(period.startTime > 0){
period.endTime = rawPPK.unix_time; period.endTime = rawPPK.unix_time;
period.endId = i - 1; period.endId = i - 1;
LOG(INFO) << setprecision(15) << "period.meshId: " << period.meshId
<< " period.startTime: " << period.startTime
<< " period.endId: " << period.endId;
ppkPeriodVec_.emplace_back(period); ppkPeriodVec_.emplace_back(period);
LOG(INFO) << "period.meshId: " << period.meshId;
} }
period.startTime = rawPPK.unix_time; period.startTime = rawPPK.unix_time;
period.startId = i; period.startId = i;
......
...@@ -172,9 +172,13 @@ double MeshArea::AreaAvgGridCnt(const Vector3d &pose) ...@@ -172,9 +172,13 @@ double MeshArea::AreaAvgGridCnt(const Vector3d &pose)
calShiftedIndex(pose.x(), pose.y()); calShiftedIndex(pose.x(), pose.y());
for(unsigned int i = 0; i < checkGridNeighbors_.size(); i++){ for(unsigned int i = 0; i < checkGridNeighbors_.size(); i++){
Vector2i curr_index = shiftedIndexToLoad + checkGridNeighbors_[i]; Vector2i curr_index = shiftedIndexToLoad + checkGridNeighbors_[i];
if(curr_index.x() < 0 || curr_index.x() >= rowItemCnt_ ||
curr_index.y() < 0 || curr_index.y() >= colItemCnt_){
continue;
}
const BlockContent &blockContent = blockAreaTable_[curr_index.x()][curr_index.y()]; const BlockContent &blockContent = blockAreaTable_[curr_index.x()][curr_index.y()];
if(blockContent.blockState == CurrMesh && if(blockContent.blockState == CurrMesh && blockContent.block
blockContent.block->isLoad()){ && blockContent.block->isLoad()){
total += blockContent.block->GetGridSize(); total += blockContent.block->GetGridSize();
} }
} }
......
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