Robert Haschke
a6a23d3775
Remove set[Start|End]StateUnsafe
...
These methods were introduced to temporarily set meaningful states for cost calculation
w/o connecting the solution to these temporary states (to solve a chicken-egg problem).
This commit provides TmpInterfaceStateProvider as an alternative approach to this problem.
This essentially reverts 53c0964618 .
2020-12-06 04:11:35 +01:00
Robert Haschke
c8e75ab205
Simplify SolutionCollector
2020-12-06 04:11:35 +01:00
Robert Haschke
576a1aa48d
Remove default constructor for Priority
...
It's better to explicitly state the initial value.
2020-12-06 04:11:35 +01:00
Robert Haschke
56ad37d80e
Provide move constructor for InterfaceState
...
The code was tuned to move InterfaceStates around, but there wasn't the matching constructor!
2020-12-06 04:11:35 +01:00
Robert Haschke
bc25c5e3c1
Modernize: require cmake version 3.1.3
2020-12-06 04:11:35 +01:00
Robert Haschke
5d4cf640ef
Fix issues #182 + #218
2020-12-06 04:10:47 +01:00
Robert Haschke
a9cd4e3281
Connect: Decouple subsolutions of SolutionSequence from external interface states
2020-12-06 04:09:59 +01:00
Robert Haschke
f05b08fa8a
SerialContainer: Simplify solution traversal
...
Compute depth + accumulated cost of a partial solution sequence using InterfaceState::Priority.
2020-12-06 04:09:59 +01:00
Robert Haschke
11647fd3e5
Connect: mark failures in sub solutions of a sequence
2020-12-06 04:09:59 +01:00
Robert Haschke
c73c0c3555
Interface::updatePriority(): only allow decrease
2020-12-06 04:06:08 +01:00
Robert Haschke
08dc19f7b3
Fix cost calculation
...
The default CostTerm should rely on precomputed costs. Only, if a CostTerm is explicitly defined
for a particular stage, it should modify costs.
2020-12-06 04:06:08 +01:00
Robert Haschke
66fdff9711
Simplify state priority updates
...
Only need to update the end points of a partial solution.
2020-12-06 04:06:08 +01:00
Robert Haschke
5fd98ce307
SerialContainer tests
2020-12-06 04:06:08 +01:00
Robert Haschke
fe189cd692
Test Interface::updatePriority()
2020-12-06 04:06:08 +01:00
Robert Haschke
b2adcf0247
Python3 compatibility
2020-11-30 13:34:33 +01:00
Robert Haschke
c97b462024
migration: boost::python -> pybind11
2020-11-30 13:34:33 +01:00
Robert Haschke
8433e460e4
Merge branch 'master' into wip-python-api
2020-11-26 12:05:03 +01:00
cpetersmeier
012a10be25
StagesWrapper: Python Function Bindings
...
Add python bindings for
- SimpleGrasp::setIKFrame
- Pick::setApproachMotion
- Pick::setLiftMotion
2020-11-26 11:47:20 +01:00
Robert Haschke
ef9c7612a9
Fix (again) creation of TaskPanel
2020-10-30 00:44:51 +01:00
Robert Haschke
f7ea72010b
Fix ambiguous member initialization
2020-10-30 00:44:51 +01:00
Robert Haschke
bfa2a6070d
MoveTo: Publish failed planning attempts
2020-10-30 00:44:51 +01:00
Robert Haschke
e83a5ecefa
Configurable handling of old remote tasks
...
- keep all previous tasks
- replace with next task of same id
- always remove
2020-10-30 00:44:51 +01:00
Robert Haschke
ae843a784e
Merge PR #214 (fix various issues) and #215 (rework rviz introspection)
2020-10-24 04:45:53 +02:00
Robert Haschke
cf5031e89d
Create task-specific ServiceClients to fetch solutions
...
This finally allows to have multiple tasks publishing in the same namespace.
2020-10-24 04:43:30 +02:00
Robert Haschke
b91d87c6eb
IntroSpection: indicateReset() on disable
2020-10-24 04:43:30 +02:00
Robert Haschke
8b1c66c4b7
Allow naming a Task
...
which just names the top-level container
2020-10-24 04:43:30 +02:00
Robert Haschke
c471879b08
Rename process_id -> task_id
2020-10-24 04:43:30 +02:00
Robert Haschke
b071a059f9
Rename TaskPrivate::id -> TaskPrivate::ns
...
TaskPrivate's id_ actually served as a namespace parameter.
2020-10-24 04:43:30 +02:00
Robert Haschke
3a7a4eb953
Connect: Fix segfault when accessing solutions from multiple plan() calls
...
Connect::init() was resetting its dynamically created JMG merged_jmg_,
thus invalidating all previous solutions. Only reset the JMG in reset().
2020-10-24 03:23:19 +02:00
Robert Haschke
c7151dcc48
Remove mainloop jobs
...
All topics are handled by the Display's update_nh_ within the main GUI thread anyway.
2020-10-24 03:23:19 +02:00
Robert Haschke
d78048719d
Fix memory leakage
2020-10-24 03:23:19 +02:00
Robert Haschke
43828506b5
Fix TaskView segfault
...
We shouldn't "change" solution/property models if they didn't actually changed.
2020-10-24 03:23:19 +02:00
Robert Haschke
8b8666c64e
TaskPanel: Fix assertion
...
When loading an .rviz config with MTC displays disabled, the mainloop_job to create a TaskPanel
will never be executed (because the display is disabled). Removing the display will then hit the
assertion that DISPLAY_COUNT > 0.
Fixed, by not relying on Display::update, but just scheduling a Qt GUI job via QTimer::singleShot().
2020-10-24 03:23:19 +02:00
Robert Haschke
cb0f20cad7
Improve task unittests
2020-10-24 03:22:46 +02:00
Jafar Abdi
be270cb574
Task: Add ability to set timeout ( #213 )
...
Task::setTimeout will allow setting an overall timeout.
2020-10-24 03:22:05 +02:00
cpetersmeier
ede5fe396f
StagesWrapper: Add std::map setGoal overload.
...
Adding a further overload of the `setGoal()` function that is exposed to
the python api. This should provide an interface for passing in dicts as
joint name and -angle configurations.
2020-10-21 16:45:05 +02:00
Robert Haschke
d3b878a31c
Fix issues with Merger stage
2020-09-23 08:00:42 +02:00
Robert Haschke
88c217e9a6
Report exceptions (e.g. config issues)
2020-09-23 07:59:39 +02:00
Robert Haschke
7499f7b297
Report merge failures
2020-09-23 07:59:39 +02:00
Robert Haschke
14fc3d2586
Reject failures early
2020-09-23 07:59:39 +02:00
Robert Haschke
a0d54b6e69
Adapt codecov.yaml
...
unifying it with MoveIt's config file
2020-09-23 07:49:31 +02:00
Robert Haschke
49b2ff8ce5
Test Merger
2020-09-22 11:06:34 +02:00
Robert Haschke
745d6739bd
fix typo
2020-09-22 11:06:01 +02:00
Robert Haschke
8152994e52
Fix interface resolution
2020-09-22 10:57:49 +02:00
Robert Haschke
d0dc384bdf
Update TaskModel for all columns, including time
2020-09-22 10:56:11 +02:00
Robert Haschke
4089d5eefa
Container::remove(): return removed Stage
2020-09-22 10:56:11 +02:00
Robert Haschke
e9c56c9c64
Merge PR #183 : CostTerm API
2020-09-22 07:47:42 +02:00
Robert Haschke
198f8f5389
clearer naming of cost variables
2020-09-21 22:52:19 +02:00
v4hn
04a8afb16c
melodic compatibility
2020-09-21 22:52:19 +02:00
v4hn
5d0fd57754
initialize default CostTerm in constructor
...
It seems to be too fragile to rely on `init` being called.
On the other hand we should really enforce this anyway. -.-
2020-09-21 22:52:19 +02:00