Commit 3a66a0a2 authored by limingbo's avatar limingbo

add period

parent 9aec7740
...@@ -22,7 +22,7 @@ vector<string> getActiveTraces( ...@@ -22,7 +22,7 @@ vector<string> getActiveTraces(
void getCrossTasks( void getCrossTasks(
const vector<string> &allTask, const vector<string> &allTask,
vector<pair<string, vector<pair<float, float>>>> &crossTasks) vector<pair<string, vector<pair<double, double>>>> &crossTasks)
{ {
if(allTask.size() < 2){ if(allTask.size() < 2){
return; return;
...@@ -152,9 +152,9 @@ bool checkMeshOut( ...@@ -152,9 +152,9 @@ bool checkMeshOut(
return false; return false;
} }
vector<pair<string, vector<pair<float, float>>>> crossFilter( vector<pair<string, vector<pair<double, double>>>> crossFilter(
const vector<TaskInfo> &filteredTaskInfo){ const vector<TaskInfo> &filteredTaskInfo){
vector<pair<string, vector<pair<float, float>>>> ret; vector<pair<string, vector<pair<double, double>>>> ret;
if(filteredTaskInfo.size() < 2){ if(filteredTaskInfo.size() < 2){
return ret; return ret;
} }
...@@ -176,9 +176,9 @@ vector<pair<string, vector<pair<float, float>>>> crossFilter( ...@@ -176,9 +176,9 @@ vector<pair<string, vector<pair<float, float>>>> crossFilter(
for(size_t pcIndex = 1; pcIndex < pointClouds.size(); pcIndex++){ for(size_t pcIndex = 1; pcIndex < pointClouds.size(); pcIndex++){
bool found = false; bool found = false;
bool inPeriod = false; bool inPeriod = false;
float start =0, end = 0; double start =0, end = 0;
pair<string, vector<pair<float, float>>> oneRet; pair<string, vector<pair<double, double>>> oneRet;
vector<pair<float, float>> timePeriods; vector<pair<double, double>> timePeriods;
float currTime; float currTime;
for(const PointExport& query : pointClouds[pcIndex]->points){ for(const PointExport& query : pointClouds[pcIndex]->points){
int result_index; int result_index;
......
...@@ -20,7 +20,7 @@ vector<string> getCloseTasks( ...@@ -20,7 +20,7 @@ vector<string> getCloseTasks(
void getCrossTasks( void getCrossTasks(
const vector<string> &allTask, const vector<string> &allTask,
vector<pair<string, vector<pair<float, float> > > > &crossTasks); vector<pair<string, vector<pair<double, double> > > > &crossTasks);
bool getTaskInfo( bool getTaskInfo(
const string &taskPath, const string &taskPath,
...@@ -37,7 +37,7 @@ bool checkMeshOut( ...@@ -37,7 +37,7 @@ bool checkMeshOut(
const MeshOut& query, const MeshOut& query,
const MeshOut& target); const MeshOut& target);
vector<pair<string, vector<pair<float, float>>>> crossFilter( vector<pair<string, vector<pair<double, double> > > > crossFilter(
const vector<TaskInfo> &filteredTaskInfo); const vector<TaskInfo> &filteredTaskInfo);
bool initTrajectory(const string &trajPath, bool initTrajectory(const string &trajPath,
......
...@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) ...@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
} }
activeTraces.insert(activeTraces.begin(), FLAGS_base_dir); activeTraces.insert(activeTraces.begin(), FLAGS_base_dir);
vector<pair<string, vector<pair<float, float>>>> crossTasks; vector<pair<string, vector<pair<double, double>>>> crossTasks;
getCrossTasks(activeTraces, crossTasks); getCrossTasks(activeTraces, crossTasks);
if(crossTasks.size() == 0){ if(crossTasks.size() == 0){
LOG(WARNING) << "crossTasks.size() == 0"; LOG(WARNING) << "crossTasks.size() == 0";
......
...@@ -58,14 +58,14 @@ struct PointExport { ...@@ -58,14 +58,14 @@ struct PointExport {
PCL_ADD_RGB PCL_ADD_RGB
float intensity = 0; float intensity = 0;
float label = 0; float label = 0;
float info = 0; double info = 0;
EIGEN_MAKE_ALIGNED_OPERATOR_NEW // make sure our new allocators are aligned EIGEN_MAKE_ALIGNED_OPERATOR_NEW // make sure our new allocators are aligned
} EIGEN_ALIGN16; } EIGEN_ALIGN16;
}//end namespace pcl }//end namespace pcl
POINT_CLOUD_REGISTER_POINT_STRUCT( POINT_CLOUD_REGISTER_POINT_STRUCT(
pcl::PointExport, (float, x, x)(float, y, y)(float, z, z)(float, rgb, rgb) pcl::PointExport, (float, x, x)(float, y, y)(float, z, z)(float, rgb, rgb)
(float, intensity, intensity)(float, label, label)(float, info, info)) (float, intensity, intensity)(float, label, label)(double, info, info))
typedef pcl::PointExport PointExport; typedef pcl::PointExport PointExport;
typedef pcl::PointCloud<PointExport> PointCloudExport; typedef pcl::PointCloud<PointExport> PointCloudExport;
......
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