Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CCS project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
csorvagep
CCS project
Commits
d37d5a28
Commit
d37d5a28
authored
Apr 12, 2014
by
Gabor Csorvasi
Browse files
Options
Downloads
Patches
Plain Diff
Algorithm section in JSON file.
parent
5ebc1f16
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
env/frame6.json
+5
-1
5 additions, 1 deletion
env/frame6.json
planner/ARMBuilder.cpp
+0
-4
0 additions, 4 deletions
planner/ARMBuilder.cpp
planner/PlannerThread.cpp
+11
-4
11 additions, 4 deletions
planner/PlannerThread.cpp
with
16 additions
and
9 deletions
env/frame6.json
+
5
−
1
View file @
d37d5a28
{
{
"type"
:
"environment"
,
"type"
:
"scene"
,
"algo"
:
{
"dx"
:
2
,
"dy"
:
2
},
"boundary"
:
{
"boundary"
:
{
"height"
:
30.0
,
"height"
:
30.0
,
"width"
:
35.0
"width"
:
35.0
...
...
This diff is collapsed.
Click to expand it.
planner/ARMBuilder.cpp
+
0
−
4
View file @
d37d5a28
...
@@ -37,10 +37,6 @@ ARMBuilder::ARMBuilder(Configuration& startConfig, OccupancyGrid& og, Scene& sc)
...
@@ -37,10 +37,6 @@ ARMBuilder::ARMBuilder(Configuration& startConfig, OccupancyGrid& og, Scene& sc)
}
}
}
}
}
}
// for(unsigned i = 0; i<reachableArcs.size(); i++) {
// std::cout << reachableArcs[i] << std::endl;
// }
}
}
ARM
&
ARMBuilder
::
getARM
()
{
ARM
&
ARMBuilder
::
getARM
()
{
...
...
This diff is collapsed.
Click to expand it.
planner/PlannerThread.cpp
+
11
−
4
View file @
d37d5a28
...
@@ -45,7 +45,7 @@ void PlannerThread::run() {
...
@@ -45,7 +45,7 @@ void PlannerThread::run() {
QJsonObject
envObj
=
jsonEnv
.
object
();
QJsonObject
envObj
=
jsonEnv
.
object
();
QJsonValue
boundaryVal
=
envObj
[
"boundary"
];
QJsonValue
boundaryVal
=
envObj
[
"boundary"
];
if
(
boundaryVal
.
isUndefined
())
{
if
(
boundaryVal
.
isUndefined
()
||
boundaryVal
.
isNull
()
)
{
_writeLog
(
"No boundary section!"
);
_writeLog
(
"No boundary section!"
);
return
;
return
;
}
}
...
@@ -54,7 +54,7 @@ void PlannerThread::run() {
...
@@ -54,7 +54,7 @@ void PlannerThread::run() {
_drawBoundary
(
env
.
getBoundary
());
_drawBoundary
(
env
.
getBoundary
());
QJsonValue
obstVal
=
envObj
[
"obstacles"
];
QJsonValue
obstVal
=
envObj
[
"obstacles"
];
if
(
obstVal
.
isUndefined
())
{
if
(
obstVal
.
isUndefined
()
||
obstVal
.
isNull
()
)
{
_writeLog
(
"No obstacle section!"
);
_writeLog
(
"No obstacle section!"
);
return
;
return
;
}
}
...
@@ -73,7 +73,7 @@ void PlannerThread::run() {
...
@@ -73,7 +73,7 @@ void PlannerThread::run() {
}
}
QJsonValue
robotVal
=
envObj
[
"robot"
];
QJsonValue
robotVal
=
envObj
[
"robot"
];
if
(
ob
s
tVal
.
isUndefined
())
{
if
(
r
ob
o
tVal
.
isUndefined
()
||
robotVal
.
isNull
()
)
{
_writeLog
(
"No robot section!"
);
_writeLog
(
"No robot section!"
);
return
;
return
;
}
}
...
@@ -115,7 +115,14 @@ void PlannerThread::run() {
...
@@ -115,7 +115,14 @@ void PlannerThread::run() {
_drawPath
(
config
);
_drawPath
(
config
);
_writeLog
(
"Configuration list created."
);
_writeLog
(
"Configuration list created."
);
OccupancyGrid
oG
(
env
,
0.5
,
0.5
);
QJsonValue
algoVal
=
envObj
[
"algo"
];
if
(
algoVal
.
isUndefined
()
||
algoVal
.
isNull
())
{
_writeLog
(
"No algo section!"
);
return
;
}
QJsonObject
algoObj
=
algoVal
.
toObject
();
OccupancyGrid
oG
(
env
,
algoObj
[
"dx"
].
toDouble
(),
algoObj
[
"dy"
].
toDouble
());
_writeLog
(
"Occupancy grid created."
);
_writeLog
(
"Occupancy grid created."
);
//_drawOG(oG);
//_drawOG(oG);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment