-
Notifications
You must be signed in to change notification settings - Fork 0
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
RWC2018 #101
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit
Hold shift + click to select a range
1efdb80
Fix dependencies
Rayman 8bc7dbd
feat(count_and_tell): dummy action for counting objects and reporting
rokusottervanger 8634596
feat(count_and_tell): dummy action for asking name and reporting
rokusottervanger 9bc40ac
feat(): expose dummy actions for asking name and counting objects
rokusottervanger aa0a7a5
refactor(answer_question): apply context structure
rokusottervanger ab09656
fix(say): use lower case keywords as upper case messes up grammar
rokusottervanger 45bf1c4
fix(entity_description): entity location is also entity description
rokusottervanger d6783bd
fix(find): find person not based on name
rokusottervanger 54935de
added TellMeNameOfPerson action, not tested
SamAlexandrov 4e576a3
fix(tell_name_of_person): fixes after sim testing
rokusottervanger 52d19e8
added functionality count objects on the inspected location
SamAlexandrov 6aeae01
some refactoring on robocup
rokusottervanger d3f1558
Add state machine to count objects and write them to a VariableDesign…
LoyVanBeek 7d4c6b0
Remove debug statement
LoyVanBeek 1058c35
Move CountObjectOnLocation to robot_smach_states and wrap that state …
LoyVanBeek 9b86b6d
Include the result when debugging
LoyVanBeek 9faac8f
fix(find): move to found person
rokusottervanger d0eec6c
fix(find): add execute result succeeded
rokusottervanger efa2756
fix(tell_name_of_person): some context fixes
rokusottervanger 15530cb
change state_machine for count and tell
MatthijsBurgh 19e8505
fix(count_and_tell): clearer report of counting
rokusottervanger 24df4ca
fix(find): only find on manipulation locations
rokusottervanger e84923e
fix(find): clearer reporting
rokusottervanger 95868d0
fix(find): remove references to unassigned self._location
rokusottervanger 2b0105c
fix(count_and_tell): report if failed
rokusottervanger 22e1eb1
no logic here and fixed is_running bug
reinzor 7bf04d4
fix(send_picture): use new context structure
rokusottervanger 53ecffe
fix(find): increase radius of found person
rokusottervanger a517a5c
fix(guide): check if found a person
rokusottervanger bef6633
fix(navigate_to): fix waypoint navigation
rokusottervanger 3d83c03
fix(find): select person based on label
rokusottervanger b30e9ed
fix(guide): use navigate state
rokusottervanger 878056c
fix(navigate_to): if person found, nav to waypoint
rokusottervanger 455d346
fix(navigate_to): fix nav to, assign to entity_designator
rokusottervanger 086eb95
feat(say): you shall not pass
rokusottervanger db310c8
feat(say): start the party soundboard string
rokusottervanger 26feed1
fix(find): not looking for specific persons in eegpsr
rokusottervanger 97c620a
fix(say): better question for more info
rokusottervanger 2d7daee
refactor(follow): new semantics and context parsing, if no target, fine
rokusottervanger cb1291f
fix(guide): clearer msg when no target specified
rokusottervanger 88c37fe
fix(pick up): source location required field
rokusottervanger 0da360e
fix(pick up): object also found if category matches
rokusottervanger d6e4cc9
fix(server): wait for tc to get in position
rokusottervanger 61ea670
fix(guide): target is required
rokusottervanger cdfd4cc
fix(follow): sucessfully followed None
rokusottervanger ecb697a
feat(open door): add open door action
rokusottervanger 4bfc3fb
feat(clear table): add action
rokusottervanger e156223
fix(server): remove robocup hack
rokusottervanger 0d05ff7
fix(init): add open door and clear table
rokusottervanger 2800114
Merge branch 'robocup' of roboticssrv.local:tue-robotics/action_serve…
rokusottervanger fc61eec
fix(open_door): add functionality of open door
rokusottervanger dd32a30
Correct imports
reinzor 61bc8e0
hardcoded cupboard in open_door action
MatthijsBurgh e6951de
fixed sm imports
reinzor 1ee9d46
Fixed merge conflict
reinzor 0688eec
constructor fixes
reinzor ba5e264
fix(guide final challenge): hard coded guide state. Hacky hacky!
rokusottervanger 004250e
fix(guide final): speak after guide
rokusottervanger 2e89756
fix(clear_table): first navigate, then open dishwasher
reinzor 688224c
feat(find): if find person, select on label
rokusottervanger dccac75
remove double dep
MatthijsBurgh d56823b
add dep on robot_smach_states
MatthijsBurgh 1048326
convert recipe to lowercase
MatthijsBurgh 3d55154
Update docstring
LarsJanssenTUe d72d58e
Remove commented code
LarsJanssenTUe 8446ebf
Remove RWC2018 specific naming
LarsJanssenTUe 1ac2563
Removed the clear_table action since it is a very ugly implementation.
JosjaG c0144a6
Rename inspect.py to inspect_action.py, to avoid conflicts with the '…
LoyVanBeek f67e837
add hero as a robot
LarsJanssenTUe 9131e7c
completed __main__ in guide.py
PetervDooren 8715110
find smach state is called differently when looking for anyone
PetervDooren d853180
Merge branch 'master' into robocup
MatthijsBurgh 37ac1d2
TEMP - simple temp fix to allow further development
JosjaG 7244973
Clean up(count and tell):fix docstring
LarsJanssenTUe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
import rospy | ||
|
||
from action import Action, ConfigurationData | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. | ||
|
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
fileThere was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.