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

Predicate System Refactor #1855

Merged
merged 28 commits into from
Apr 8, 2024
Merged

Predicate System Refactor #1855

merged 28 commits into from
Apr 8, 2024

Conversation

ASzot
Copy link
Contributor

@ASzot ASzot commented Mar 12, 2024

Motivation and Context

Refactored predicate system to allow extending and modifying predicates in downstream projects. Also simplifies how predicates are defined. This adds no new functionality. Hopefully this makes it so we don't need to change the PDDL system anymore since new predicates can be added in downstream projects rather than directly in Habitat-Lab.

How Has This Been Tested

While no new functionality was added, I added new tests for PDDL.

Types of changes

  • [Refactoring] Large changes to the code that improve its functionality or performance

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Mar 12, 2024
@ASzot ASzot requested review from aclegg3 and xavierpuigf March 12, 2024 03:47
Copy link
Contributor

@aclegg3 aclegg3 left a comment

Choose a reason for hiding this comment

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

Looks good. Nice to see some of this getting more generic. Also nice to see us getting rid of the AABB Receptacle assumption in Rearrangesim.

Copy link
Contributor

@akshararai akshararai left a comment

Choose a reason for hiding this comment

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

a few comments but looks good otherwise

Copy link
Contributor

@akshararai akshararai left a comment

Choose a reason for hiding this comment

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

a few comments but looks good otherwise

@ASzot ASzot merged commit ffd3fc4 into main Apr 8, 2024
4 checks passed
@ASzot ASzot deleted the predicate-refactor branch April 8, 2024 16:05
dannymcy pushed a commit to dannymcy/habitat-lab that referenced this pull request Jun 26, 2024
* add draft of prepositional logic query utilities and viewer demo

* add util to get contact pairs from contact points

* add functions: get_obj_from_id, get_obj_from_handle and modifies get_obj_contact_pairs

* dbv peek_scene default should be topdown

* add "below" preposition util

* refactor some prep functions. Add ontop() opterator

* refactor viewer to test ontop

* refactor objectA typing

* regularized_distance, nearby L2 and geodesic drafts, refactors to utils

* fix AO sampling and add floor check prototype

* minor changes

* clean-up on_floor query and add viewer demo

* include navmesh cell_height in the error threshold for on_floor

* refactor to support region queries

* Refactor PDDL predicates

* Allow for flexible pddl set and satisfy states

* Cleaned up

* Merged

* More docs

* Added another test

* Addressed PR comments

* Fixed test

* Fixed multi-agent test

---------

Co-authored-by: aclegg3 <alexanderwclegg@gmail.com>
dannymcy pushed a commit to dannymcy/habitat-lab that referenced this pull request Jul 8, 2024
* add draft of prepositional logic query utilities and viewer demo

* add util to get contact pairs from contact points

* add functions: get_obj_from_id, get_obj_from_handle and modifies get_obj_contact_pairs

* dbv peek_scene default should be topdown

* add "below" preposition util

* refactor some prep functions. Add ontop() opterator

* refactor viewer to test ontop

* refactor objectA typing

* regularized_distance, nearby L2 and geodesic drafts, refactors to utils

* fix AO sampling and add floor check prototype

* minor changes

* clean-up on_floor query and add viewer demo

* include navmesh cell_height in the error threshold for on_floor

* refactor to support region queries

* Refactor PDDL predicates

* Allow for flexible pddl set and satisfy states

* Cleaned up

* Merged

* More docs

* Added another test

* Addressed PR comments

* Fixed test

* Fixed multi-agent test

---------

Co-authored-by: aclegg3 <alexanderwclegg@gmail.com>
dannymcy pushed a commit to dannymcy/habitat-lab that referenced this pull request Jul 8, 2024
* add draft of prepositional logic query utilities and viewer demo

* add util to get contact pairs from contact points

* add functions: get_obj_from_id, get_obj_from_handle and modifies get_obj_contact_pairs

* dbv peek_scene default should be topdown

* add "below" preposition util

* refactor some prep functions. Add ontop() opterator

* refactor viewer to test ontop

* refactor objectA typing

* regularized_distance, nearby L2 and geodesic drafts, refactors to utils

* fix AO sampling and add floor check prototype

* minor changes

* clean-up on_floor query and add viewer demo

* include navmesh cell_height in the error threshold for on_floor

* refactor to support region queries

* Refactor PDDL predicates

* Allow for flexible pddl set and satisfy states

* Cleaned up

* Merged

* More docs

* Added another test

* Addressed PR comments

* Fixed test

* Fixed multi-agent test

---------

Co-authored-by: aclegg3 <alexanderwclegg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants