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

refactored action designators and added orm test cases #123

Merged
merged 14 commits into from
Feb 5, 2024

Conversation

davidprueser
Copy link
Contributor

No description provided.

src/pycram/designators/actions/actions.py Outdated Show resolved Hide resolved
src/pycram/designators/actions/actions.py Show resolved Hide resolved
src/pycram/designators/motion_designator.py Outdated Show resolved Hide resolved
src/pycram/designators/motion_designator.py Outdated Show resolved Hide resolved
src/pycram/task.py Show resolved Hide resolved
# Conflicts:
#	examples/intro.ipynb
#	src/pycram/designator.py
#	src/pycram/designators/action_designator.py
#	test/test_local_transformer.py
Copy link
Collaborator

@tomsch420 tomsch420 left a comment

Choose a reason for hiding this comment

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

Besides that one comment everything looks great 👍

test/test_orm.py Outdated Show resolved Hide resolved
"""
Helper method for internal usage only.
This method is to be overwritten instead of the execute method.
"""
pass

def execute(self, designator: MotionDesignatorDescription.Motion) -> Any:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why change the typing? Process Modules should still only accept MotionDesignators

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, you are right. But importing the new BaseMotion in order to use it for type hinting leads to circular imports, since it is located in the motion_designator file and the motions themselves need the ProcessModuleManager. Removing the type hint is not fancy, but I didn't see an easy way to solve that problem

src/pycram/designators/motion_designator.py Outdated Show resolved Hide resolved
src/pycram/designators/motion_designator.py Outdated Show resolved Hide resolved
src/pycram/process_modules/boxy_process_modules.py Outdated Show resolved Hide resolved
src/pycram/process_modules/boxy_process_modules.py Outdated Show resolved Hide resolved
@Tigul Tigul merged commit 15225f1 into cram2:dev Feb 5, 2024
1 check passed
artnie pushed a commit to artnie/pycram that referenced this pull request Aug 16, 2024
[Tests] adjusted test cases of language to reflect changes made for RetryMonitor
mkhoshnam pushed a commit to mkhoshnam/pycram that referenced this pull request Nov 26, 2024
refactored action designators and added orm test cases
mkhoshnam pushed a commit to mkhoshnam/pycram that referenced this pull request Nov 26, 2024
[Tests] adjusted test cases of language to reflect changes made for RetryMonitor
mkhoshnam pushed a commit to mkhoshnam/pycram that referenced this pull request Nov 26, 2024
[Tests] adjusted test cases of language to reflect changes made for RetryMonitor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants