Robert Haschke
6de1c8dbe5
ContainerBase::findChild()
2019-05-02 14:55:34 +02:00
Robert Haschke
39427f89bf
Merge branches 'fix-interface-deduction' ( #84 ), 'compute-ik-default-timeout' ( #80 ),
...
'fix-visualization' (#76 ), and master-improvements (#81 )
2019-03-11 14:09:03 +01:00
Robert Haschke
c56c7294e4
fix pruning
...
Never augment already derived interfaces, only prune!
2019-03-11 13:54:54 +01:00
Robert Haschke
48d93e803d
improve SerialContainerPrivate::pruneInterface
2019-03-11 13:54:54 +01:00
Robert Haschke
905b6a3b0c
move validateConnectivity() from ContainerBase to StagePrivate
...
... to allow specific stage types (PropagatingEitherWay) implementing their own validation
No need for a public interface.
2019-03-11 13:54:54 +01:00
Robert Haschke
10c7a9cfd7
prune UNKNOWN *and* PROPAGATE_BOTHWAYS
...
If PropagatingEitherWay's interface is not met in *both* directions (but only one),
in BOTHWAY mode, issue a warning. Otherwise handle both, AUTO and BOTHWAY mode,
in the same fashion when resolving interfaces.
TODO: move validateConnectivity() in StagePrivate.
default action = default action from ContainerBase.
PropagatingEitherWay: issue warning for case above
2019-03-11 13:54:54 +01:00
Robert Haschke
f831fe5483
fix comments + typos
2019-03-11 13:54:54 +01:00
Robert Haschke
d741f36ee3
fixup! improve error msg for mismatching container/child interfaces
...
We need to consider input and output interfaces separately.
Also, use console output symbols (<- / -> / <->)
2019-03-11 13:54:54 +01:00
Robert Haschke
e885c272fa
Merger: skip empty sub trajectories for merging
2019-02-21 00:50:25 +01:00
Robert Haschke
2da9e0d722
rework solution msgs
...
- to allow solution wrappers (WrappedSolution, SolutionSequence)
to transmit their comment and markers as well
- introduced new SolutionInfo.msg,
which is the info common to solution wrappers and actual SubTrajectories
2019-02-12 13:57:12 +01:00
Robert Haschke
a1f7c5d1c6
improve error msg for mismatching container/child interfaces
2019-02-06 10:29:10 +01:00
v4hn
80adcb9e24
add comments to wrapped solutions
2018-10-24 11:53:14 +02:00
Robert Haschke
3215880b98
Merge branches 'move-to', 'simple-grasp' and 'properties' into master
...
These branches only work together:
- MoveTo / MoveRelative: common handling of "goal" property
- properties: required changes to allow for multiple inheritance
- generalize SimpleGrasp / GenerateGraspPose
2018-06-03 11:38:50 +02:00
Robert Haschke
2e46082521
remove Container::exposePropertiesOfChild()
2018-06-03 11:36:50 +02:00
Robert Haschke
157caac385
generalize SimpleGrasp / GenerateGraspPose
...
- move "pregrasp", "grasp" property from SimpleGrasp to GenerateGraspPose
- Container::exposePropertiesOfChild: decouple exposure from inheritance
2018-06-03 11:36:50 +02:00
Robert Haschke
a8431ce661
Container::exposePropertiesOfChild: allow skipping of undefined props
2018-06-03 06:46:12 +02:00
Robert Haschke
beffe27987
improve property debugging
2018-06-03 06:42:11 +02:00
Robert Haschke
b35aba6e19
validate merged trajectories
2018-05-30 21:23:34 +02:00
Robert Haschke
c2dd28abae
rework storing of solutions
...
- solutions_, failures_ as SolutionBaseConstPtrs in StagePrivate
- replace processSolutions() / processFailures() by direct const-access to storage containers
- generic sendForward(), sendBackward(), spawn(), connect() methods in StagePrivate
- reuse StagePrivate's sendForward(), sendBackward(), spawn() in containers
- store created InterfaceStates in StagePrivate::states_
- Interface: ordered<InterfaceState*> (only store pointers)
allows for common handling of states of valid and failure solutions
- remove additional state+solution storages
- containers: internal->external state mapping as InterfaceState* -> InterfaceState*
2018-05-30 21:02:50 +02:00
Robert Haschke
52fdf30433
simplify compute() API
...
- remove bool return value
- always create a solution trajectory, also in case of failures
- success/failure determined from solution.isFailure()
minor adjustments during cherry-pick
2018-05-30 21:01:34 +02:00
Robert Haschke
b7b7a916df
basic merger functionality
2018-05-18 17:44:55 +02:00
Robert Haschke
51e1dda6ec
minor improvements: variable names, comments
2018-04-10 01:52:40 +02:00
Robert Haschke
8811045f89
setCreator() once in StagePrivate::newSolution()
2018-04-05 13:51:50 +02:00
Robert Haschke
9ceecd235f
SerialSolution -> SolutionSequence
2018-04-05 13:51:50 +02:00
Robert Haschke
f0dc02e2c3
ContainerBasePrivate::position() -> childByIndex()
2018-03-26 00:24:25 +02:00
Robert Haschke
84f5c481be
ContainerBasePrivate::position(): generically handle shifting
2018-03-26 00:24:25 +02:00
Robert Haschke
c2590636b1
fixup! SerialContainer: don't consider failures for solutions
2018-03-23 11:22:23 +01:00
Robert Haschke
862ac37cd6
fix ContainerBasePrivate::copyState(): don't copy (again) on update
2018-03-23 11:22:23 +01:00
Robert Haschke
6d859840c3
fix interface detection for nested SerialContainers
2018-03-23 09:18:21 +01:00
Robert Haschke
159beeb044
fix SerialContainer::canCompute()
2018-03-23 09:18:21 +01:00
Robert Haschke
d731e943f1
Merge branch 'parallel-container'
2018-02-25 23:12:35 +01:00
Robert Haschke
12582f6bbc
SerialContainer: don't consider failures for solutions
2018-02-25 20:01:43 +01:00
Robert Haschke
99adfaf454
fix ParallelContainers' init()
2018-02-25 13:22:26 +01:00
Robert Haschke
dcf23f6147
relax ParallelContainer's validateConnectivity()
2018-02-25 13:22:26 +01:00
Robert Haschke
bcacda8507
implement ParallelContainer's pruneInterface()
2018-02-25 13:22:26 +01:00
eirtech
0dc4f5c53e
ParallelContainer's requiredInterface()
2018-02-25 13:22:26 +01:00
Robert Haschke
a2fd5fb7b8
more constexpr InterfaceFlags
2018-02-25 11:59:51 +01:00
Robert Haschke
a24039846a
Merge branches 'analyze-property-errors' and 'fixes'
2018-02-24 13:45:51 +01:00
Robert Haschke
e9d1742337
ContainerBase::exposePropertiesOfChild
2018-02-24 13:42:18 +01:00
Robert Haschke
6444229877
Stage::reportPropertyError
2018-02-24 13:42:18 +01:00
Robert Haschke
cf54024379
fix derivation of propagation direction from connect stage
2018-02-24 13:42:12 +01:00
Robert Haschke
6a3456f961
unittest ContainerBasePrivate::position()
2018-02-24 13:42:12 +01:00
Robert Haschke
9cd6efe46f
Stage::init(PlanningScene) -> Stage::init(RobotModel)
2018-02-24 13:37:50 +01:00
Robert Haschke
cf76352d2d
Merge branches 'fix-containers' and 'fix-priority-updates'
2018-02-20 08:07:48 +01:00
Robert Haschke
ba75f7c835
fixed remaining unittest
2018-02-20 08:06:23 +01:00
Robert Haschke
e368fd9948
avoid accidental overwrite of InterfaceState
2018-02-19 09:05:56 +01:00
Robert Haschke
373d7f204f
update priorities of all interface states along a (partial) solution path
...
if a parallel container is involved somewhere in the middle, it will
again access these states, e.g. planning alternative solutions
2018-02-19 09:05:56 +01:00
Robert Haschke
1eacea6b35
reset InterfaceState::owner_ if state is removed from Interface
2018-02-19 09:05:56 +01:00
Robert Haschke
35f1540369
recursive interface auto-detection
...
trigger auto-detection from top (task) level:
only there we now for sure the accepted interface
2018-02-19 01:05:56 +01:00
Robert Haschke
f45a4e3e2c
improve validation
...
- postpone pruning / interface auto-detection to top task-level
only the task state knows for sure, that it requires its wrapped child to push to both ends
- perform connectivity validation only after pruning
only then, we the interfaces are completely determined
2018-02-19 01:05:56 +01:00