Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RWC2018 #101

Merged
merged 74 commits into from
Apr 23, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
1efdb80
Fix dependencies
Rayman Jun 17, 2018
8bc7dbd
feat(count_and_tell): dummy action for counting objects and reporting
rokusottervanger Jun 17, 2018
8634596
feat(count_and_tell): dummy action for asking name and reporting
rokusottervanger Jun 17, 2018
9bc40ac
feat(): expose dummy actions for asking name and counting objects
rokusottervanger Jun 17, 2018
aa0a7a5
refactor(answer_question): apply context structure
rokusottervanger Jun 17, 2018
ab09656
fix(say): use lower case keywords as upper case messes up grammar
rokusottervanger Jun 17, 2018
45bf1c4
fix(entity_description): entity location is also entity description
rokusottervanger Jun 17, 2018
d6783bd
fix(find): find person not based on name
rokusottervanger Jun 17, 2018
54935de
added TellMeNameOfPerson action, not tested
SamAlexandrov Jun 17, 2018
4e576a3
fix(tell_name_of_person): fixes after sim testing
rokusottervanger Jun 18, 2018
52d19e8
added functionality count objects on the inspected location
SamAlexandrov Jun 18, 2018
6aeae01
some refactoring on robocup
rokusottervanger Jun 19, 2018
d3f1558
Add state machine to count objects and write them to a VariableDesign…
LoyVanBeek Jun 19, 2018
7d4c6b0
Remove debug statement
LoyVanBeek Jun 19, 2018
1058c35
Move CountObjectOnLocation to robot_smach_states and wrap that state …
LoyVanBeek Jun 19, 2018
9b86b6d
Include the result when debugging
LoyVanBeek Jun 19, 2018
9faac8f
fix(find): move to found person
rokusottervanger Jun 19, 2018
d0eec6c
fix(find): add execute result succeeded
rokusottervanger Jun 19, 2018
efa2756
fix(tell_name_of_person): some context fixes
rokusottervanger Jun 19, 2018
15530cb
change state_machine for count and tell
MatthijsBurgh Jun 19, 2018
19e8505
fix(count_and_tell): clearer report of counting
rokusottervanger Jun 19, 2018
24df4ca
fix(find): only find on manipulation locations
rokusottervanger Jun 19, 2018
e84923e
fix(find): clearer reporting
rokusottervanger Jun 19, 2018
95868d0
fix(find): remove references to unassigned self._location
rokusottervanger Jun 19, 2018
2b0105c
fix(count_and_tell): report if failed
rokusottervanger Jun 19, 2018
22e1eb1
no logic here and fixed is_running bug
reinzor Jun 19, 2018
7bf04d4
fix(send_picture): use new context structure
rokusottervanger Jun 19, 2018
53ecffe
fix(find): increase radius of found person
rokusottervanger Jun 19, 2018
a517a5c
fix(guide): check if found a person
rokusottervanger Jun 19, 2018
bef6633
fix(navigate_to): fix waypoint navigation
rokusottervanger Jun 19, 2018
3d83c03
fix(find): select person based on label
rokusottervanger Jun 19, 2018
b30e9ed
fix(guide): use navigate state
rokusottervanger Jun 19, 2018
878056c
fix(navigate_to): if person found, nav to waypoint
rokusottervanger Jun 19, 2018
455d346
fix(navigate_to): fix nav to, assign to entity_designator
rokusottervanger Jun 19, 2018
086eb95
feat(say): you shall not pass
rokusottervanger Jun 19, 2018
db310c8
feat(say): start the party soundboard string
rokusottervanger Jun 19, 2018
26feed1
fix(find): not looking for specific persons in eegpsr
rokusottervanger Jun 20, 2018
97c620a
fix(say): better question for more info
rokusottervanger Jun 20, 2018
2d7daee
refactor(follow): new semantics and context parsing, if no target, fine
rokusottervanger Jun 20, 2018
cb1291f
fix(guide): clearer msg when no target specified
rokusottervanger Jun 20, 2018
88c37fe
fix(pick up): source location required field
rokusottervanger Jun 20, 2018
0da360e
fix(pick up): object also found if category matches
rokusottervanger Jun 20, 2018
d6e4cc9
fix(server): wait for tc to get in position
rokusottervanger Jun 20, 2018
61ea670
fix(guide): target is required
rokusottervanger Jun 20, 2018
cdfd4cc
fix(follow): sucessfully followed None
rokusottervanger Jun 20, 2018
ecb697a
feat(open door): add open door action
rokusottervanger Jun 21, 2018
4bfc3fb
feat(clear table): add action
rokusottervanger Jun 21, 2018
e156223
fix(server): remove robocup hack
rokusottervanger Jun 21, 2018
0d05ff7
fix(init): add open door and clear table
rokusottervanger Jun 21, 2018
2800114
Merge branch 'robocup' of roboticssrv.local:tue-robotics/action_serve…
rokusottervanger Jun 21, 2018
fc61eec
fix(open_door): add functionality of open door
rokusottervanger Jun 21, 2018
dd32a30
Correct imports
reinzor Jun 21, 2018
61bc8e0
hardcoded cupboard in open_door action
MatthijsBurgh Jun 21, 2018
e6951de
fixed sm imports
reinzor Jun 21, 2018
1ee9d46
Fixed merge conflict
reinzor Jun 21, 2018
0688eec
constructor fixes
reinzor Jun 21, 2018
ba5e264
fix(guide final challenge): hard coded guide state. Hacky hacky!
rokusottervanger Jun 21, 2018
004250e
fix(guide final): speak after guide
rokusottervanger Jun 21, 2018
2e89756
fix(clear_table): first navigate, then open dishwasher
reinzor Jun 21, 2018
688224c
feat(find): if find person, select on label
rokusottervanger Jun 21, 2018
dccac75
remove double dep
MatthijsBurgh Sep 26, 2018
d56823b
add dep on robot_smach_states
MatthijsBurgh Nov 18, 2018
1048326
convert recipe to lowercase
MatthijsBurgh Nov 19, 2018
3d55154
Update docstring
LarsJanssenTUe Feb 12, 2019
d72d58e
Remove commented code
LarsJanssenTUe Feb 12, 2019
8446ebf
Remove RWC2018 specific naming
LarsJanssenTUe Feb 26, 2019
1ac2563
Removed the clear_table action since it is a very ugly implementation.
JosjaG Mar 9, 2019
c0144a6
Rename inspect.py to inspect_action.py, to avoid conflicts with the '…
LoyVanBeek Mar 19, 2019
f67e837
add hero as a robot
LarsJanssenTUe Mar 19, 2019
9131e7c
completed __main__ in guide.py
PetervDooren Mar 26, 2019
8715110
find smach state is called differently when looking for anyone
PetervDooren Apr 2, 2019
d853180
Merge branch 'master' into robocup
MatthijsBurgh Apr 2, 2019
37ac1d2
TEMP - simple temp fix to allow further development
JosjaG Apr 9, 2019
7244973
Clean up(count and tell):fix docstring
LarsJanssenTUe Apr 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion action_server/src/action_server/actions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from guide import Guide
from gripper_goal import GripperGoal
from hand_over import HandOver
from inspect import Inspect
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolute imports will fix this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That does not make sense for a __init__.py file

Copy link
Member Author

@MatthijsBurgh MatthijsBurgh Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the guidelines for python3 regarding imports in __init__.py?

I know that all normal imports should be absolute, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normal imports can also be relative but preferred to be absolute, esp. in our codebase.

When creating a package, which we do here, such relative imports are how it should be done: https://docs.python.org/2/tutorial/modules.html#packages

Python3 didn't change in this regard AFAIK.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure what the best solution is yet, but if we start changing names, it should be consistent and done for all actions.

from inspect_action import Inspect
from look_at import LookAt
from navigate_to import NavigateTo
from pick_up import PickUp
Expand Down
5 changes: 3 additions & 2 deletions action_server/src/action_server/actions/guide.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import rospy

from action import Action, ConfigurationData
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most clean to start with action import


import robot_smach_states as states
import robot_smach_states.util.designators as ds
from entity_description import resolve_entity_description

import rospy


class Guide(Action):
''' The Guide class navigates to a target, telling someone to follow the robot and about arriving at the target.
Expand Down