Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
M
multiTraj
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangdawei
multiTraj
Commits
1e35434a
Commit
1e35434a
authored
Feb 28, 2022
by
limingbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
a5717144
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
17 deletions
+18
-17
CMakeLists.txt.user
CMakeLists.txt.user
+4
-4
multi_traj_functions.cpp
apps/function/multi_traj_functions.cpp
+7
-7
multi_traj_functions.h
apps/function/multi_traj_functions.h
+3
-4
multi_traj.cpp
apps/multi_traj.cpp
+4
-2
No files found.
CMakeLists.txt.user
View file @
1e35434a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.5.2, 2022-02-2
5T19:14:42
. -->
<!-- Written by QtCreator 4.5.2, 2022-02-2
8T16:38:20
. -->
<qtcreator>
<data>
<variable>
EnvironmentId
</variable>
...
...
@@ -62,7 +62,7 @@
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Desktop
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
>
Desktop
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
{a481ffb4-75ee-455c-9443-95f457b0df68}
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveBuildConfiguration"
>
1
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveBuildConfiguration"
>
0
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveDeployConfiguration"
>
0
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveRunConfiguration"
>
0
</value>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.Target.BuildConfiguration.0"
>
...
...
@@ -209,9 +209,9 @@
<value
type=
"int"
>
14
</value>
</valuelist>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguation.Title"
>
multi_traj
</value>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguration.Arguments"
></value>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguration.Arguments"
>
--base_dir=/home/juefx/temp/2069
</value>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"
></value>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default"
>
/home/juefx/workspace/multitraj/build-multitraj-Desktop-
Release
/apps
</value>
<value
type=
"QString"
key=
"CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default"
>
/home/juefx/workspace/multitraj/build-multitraj-Desktop-
Debug
/apps
</value>
<value
type=
"int"
key=
"PE.EnvironmentAspect.Base"
>
2
</value>
<valuelist
type=
"QVariantList"
key=
"PE.EnvironmentAspect.Changes"
/>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
multi_traj
</value>
...
...
apps/function/multi_traj_functions.cpp
View file @
1e35434a
...
...
@@ -22,7 +22,7 @@ vector<string> getActiveTraces(
void
getCrossTasks
(
const
vector
<
string
>
&
allTask
,
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>>>>
&
crossTasks
)
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>>>>
&
crossTasks
)
{
if
(
allTask
.
size
()
<
2
){
return
;
...
...
@@ -52,7 +52,7 @@ void getCrossTasks(
if
(
allTaskInfo
.
front
().
meshOutPath
!=
""
){
closeTaskInfo
=
meshOutFilter
(
allTaskInfo
);
}
closeTaskInfo
.
insert
(
closeTaskInfo
.
begin
(),
allTaskInfo
.
front
());
//
closeTaskInfo.insert(closeTaskInfo.begin(), allTaskInfo.front());
if
(
closeTaskInfo
.
size
()
<
2
){
LOG
(
INFO
)
<<
"closeTaskInfo.size() < 2"
;
closeTaskInfo
=
allTaskInfo
;
...
...
@@ -152,9 +152,9 @@ bool checkMeshOut(
return
false
;
}
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>>>>
crossFilter
(
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>>>>
crossFilter
(
const
vector
<
TaskInfo
>
&
filteredTaskInfo
){
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>>>>
ret
;
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>>>>
ret
;
if
(
filteredTaskInfo
.
size
()
<
2
){
return
ret
;
}
...
...
@@ -176,9 +176,9 @@ vector<pair<string, vector<pair<double, double>>>> crossFilter(
for
(
size_t
pcIndex
=
1
;
pcIndex
<
pointClouds
.
size
();
pcIndex
++
){
bool
found
=
false
;
bool
inPeriod
=
false
;
double
start
=
0
,
end
=
0
;
pair
<
string
,
vector
<
pair
<
double
,
double
>>>
oneRet
;
vector
<
pair
<
double
,
double
>>
timePeriods
;
uint64_t
start
=
0
,
end
=
0
;
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>>>
oneRet
;
vector
<
pair
<
uint64_t
,
uint64_t
>>
timePeriods
;
float
currTime
;
for
(
const
PointExport
&
query
:
pointClouds
[
pcIndex
]
->
points
){
int
result_index
;
...
...
apps/function/multi_traj_functions.h
View file @
1e35434a
...
...
@@ -18,9 +18,8 @@ vector<string> getCloseTasks(
const
string
&
parentPath
,
boost
::
shared_ptr
<
Trajectory
>
currTraj
);
void
getCrossTasks
(
const
vector
<
string
>
&
allTask
,
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>
>
>
>
&
crossTasks
);
void
getCrossTasks
(
const
vector
<
string
>
&
allTask
,
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>
>
>
>
&
crossTasks
);
bool
getTaskInfo
(
const
string
&
taskPath
,
...
...
@@ -37,7 +36,7 @@ bool checkMeshOut(
const
MeshOut
&
query
,
const
MeshOut
&
target
);
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>
>
>
>
crossFilter
(
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>
>
>
>
crossFilter
(
const
vector
<
TaskInfo
>
&
filteredTaskInfo
);
bool
initTrajectory
(
const
string
&
trajPath
,
...
...
apps/multi_traj.cpp
View file @
1e35434a
...
...
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
}
activeTraces
.
insert
(
activeTraces
.
begin
(),
FLAGS_base_dir
);
vector
<
pair
<
string
,
vector
<
pair
<
double
,
double
>>>>
crossTasks
;
vector
<
pair
<
string
,
vector
<
pair
<
uint64_t
,
uint64_t
>>>>
crossTasks
;
getCrossTasks
(
activeTraces
,
crossTasks
);
if
(
crossTasks
.
size
()
==
0
){
LOG
(
WARNING
)
<<
"crossTasks.size() == 0"
;
...
...
@@ -60,7 +60,9 @@ int main(int argc, char *argv[])
if
(
crossTasks
.
size
()
!=
0
){
// ofs << crossTasks.back() << std::endl;
for
(
auto
task
:
crossTasks
){
ofs
<<
task
.
first
;
uint32_t
meshId
=
stoi
(
boost
::
filesystem
::
path
(
task
.
first
).
filename
().
string
());
ofs
<<
meshId
;
for
(
auto
period
:
task
.
second
){
ofs
<<
setprecision
(
15
)
<<
" "
<<
period
.
first
<<
" "
<<
period
.
second
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment