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

Merge with upstream #283

Merged
merged 10 commits into from
Apr 29, 2024
Merged

Merge with upstream #283

merged 10 commits into from
Apr 29, 2024

Conversation

NishanthJKumar
Copy link
Collaborator

Mainly want to include all the VLM changes!

NishanthJKumar and others added 9 commits March 4, 2024 15:08
…-and-Intelligent-Systems#1619)

* adds new flag to deactivate pruned grammar

* initial euclidean distance grammar implementation

* add command line flags

* need to modify stick button to contain movement options

* adds nsrts and options correctly!

* oracle works for new stick_button env!

* gets debug grammar mostly working! 37/50!

* good to go

* revert ipdb

* lots of type and linting fixes

* remove cov files

* all tests

* fixes linting

* fixes tests and other things

* adds new predicate to get 50/50 with debug grammar!

* rerun OG predicators experiments

* OG gets 41/40

* adds new predicates and operators to get oracle to 50/50!

* revert

* good to go hopefully!

* isort

* fixes tests!

* revert bad changes
…Intelligent-Systems#1627)

* Initial commit.

* Fix HandEmpty predicate to only use the robot's state.

* Get tests to pass.

* Differentiate press from pickplace in action space and fix tests.

* Add holder to PlaceStick option's arguments and get tests to pass.

* Get tests to pass.

* Remove old commented code.

* Add test to improve coverage for PlaceStick related code.

* Add tests to fix coverage.

* Add newline to end of test file.

* Run autoformatter.

* Fix test.

* Fix test.

* Update comment about collision with stick holder.
…ligent-Systems#1633)

* init commit

* good to go! Just need to address @aathalye's comment

* ready for prime time!

* yapf

* tom feedback
@NishanthJKumar NishanthJKumar self-assigned this Apr 29, 2024
@NishanthJKumar NishanthJKumar marked this pull request as ready for review April 29, 2024 22:35
@NishanthJKumar NishanthJKumar merged commit a8151a2 into master Apr 29, 2024
6 checks passed
@NishanthJKumar NishanthJKumar deleted the merge-with-upstream branch April 29, 2024 22:37
@lf-zhao
Copy link
Collaborator

lf-zhao commented Apr 30, 2024

Great!! 👍 Thanks for merging upstream VLM changes!

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.

5 participants