Commit 3ccfd427 authored by wangdawei's avatar wangdawei

60-80

parent 60ddb464
This diff is collapsed.
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#include <pcl/octree/octree.h> #include <pcl/octree/octree.h>
using namespace boost::filesystem; using namespace boost::filesystem;
const float Squared30 = 30 * 30; const float Squared_in = 60 * 60;
const float Squared40 = 40 * 40; const float Squared_out = 80 * 80;
vector<string> getActiveTraces( vector<string> getActiveTraces(
const string &activeTracePath) const string &activeTracePath)
...@@ -286,7 +286,7 @@ void filterByPosition( ...@@ -286,7 +286,7 @@ void filterByPosition(
closeDirection = true; closeDirection = true;
} }
if(inPeriod){ if(inPeriod){
if(sqr_distance < Squared30 && closeDirection){ if(sqr_distance < Squared_in && closeDirection){
end = query.info; end = query.info;
inPeriod = false; inPeriod = false;
if(end - start > 1){ if(end - start > 1){
...@@ -300,7 +300,7 @@ void filterByPosition( ...@@ -300,7 +300,7 @@ void filterByPosition(
filterdPeriod.push_back(query); filterdPeriod.push_back(query);
} }
}else{ }else{
if(sqr_distance > Squared30 || !closeDirection){ if(sqr_distance > Squared_in || !closeDirection){
start = query.info; start = query.info;
inPeriod = true; inPeriod = true;
filterdPeriod.push_back(query); filterdPeriod.push_back(query);
...@@ -480,8 +480,8 @@ vector<CloseTrajInfo> crossFilter( ...@@ -480,8 +480,8 @@ vector<CloseTrajInfo> crossFilter(
} }
} }
if(inPeriod){ if(inPeriod){
if(sqr_distance > Squared40 || if(sqr_distance > Squared_out ||
(self_sqr_distance >= 0 && self_sqr_distance < Squared30 && closeDirection)){ (self_sqr_distance >= 0 && self_sqr_distance < Squared_in && closeDirection)){
end = query.info; end = query.info;
inPeriod = false; inPeriod = false;
timePeriods.push_back(make_pair(start, end)); timePeriods.push_back(make_pair(start, end));
...@@ -493,8 +493,8 @@ vector<CloseTrajInfo> crossFilter( ...@@ -493,8 +493,8 @@ vector<CloseTrajInfo> crossFilter(
filterdPeriod.push_back(query); filterdPeriod.push_back(query);
} }
}else{ }else{
if(sqr_distance < Squared30 && if(sqr_distance < Squared_in &&
(-1 == self_sqr_distance || self_sqr_distance >= Squared30 || !closeDirection)){ (-1 == self_sqr_distance || self_sqr_distance >= Squared_in || !closeDirection)){
start = query.info; start = query.info;
inPeriod = true; inPeriod = true;
found = true; found = true;
......
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