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

Goals for CARL #97

Merged
merged 22 commits into from
Feb 9, 2024
Merged

Goals for CARL #97

merged 22 commits into from
Feb 9, 2024

Conversation

TheEimer
Copy link
Contributor

@TheEimer TheEimer commented Jul 6, 2023

This PR includes:

  • new DMC PointMass environment
  • goal extension for brax walkers
  • language mode for brax walkers

This will probably have some conflicts and should be merged last. Things to discuss:

  • Is the language mode necessary? Should we have it for other envs as well?
  • How should we deal with extensions like for brax? Since it changes the reward, I didn't want to build it into the env... should we make e.g. a CARLGoalAnt env that wraps the original internally?
  • PointMass could be extended to also include distractors, but then we'd also need a different obs space (i.e. pixels). Yay or nay?

@TheEimer TheEimer requested a review from benjamc July 6, 2023 07:32
@codecov
Copy link

codecov bot commented Jul 6, 2023

Codecov Report

Attention: 220 lines in your changes are missing coverage. Please review.

Comparison is base (f30d834) 19.05% compared to head (cb522b4) 44.61%.
Report is 800 commits behind head on development.

❗ Current head cb522b4 differs from pull request most recent head 0a7e4c9. Consider uploading reports for the commit 0a7e4c9 to get more accurate results

Additional details and impacted files
@@               Coverage Diff                @@
##           development      #97       +/-   ##
================================================
+ Coverage        19.05%   44.61%   +25.55%     
================================================
  Files               78       80        +2     
  Lines             4030     4198      +168     
  Branches           555      565       +10     
================================================
+ Hits               768     1873     +1105     
+ Misses            3224     2245      -979     
- Partials            38       80       +42     

Impacted file tree graph

@TheEimer TheEimer marked this pull request as ready for review January 8, 2024 10:16
@TheEimer TheEimer changed the base branch from main to development February 9, 2024 09:43
carl/envs/brax/carl_brax_env.py Outdated Show resolved Hide resolved
carl/envs/dmc/dmc_tasks/pointmass.py Show resolved Hide resolved
carl/envs/brax/brax_walker_goal_wrapper.py Outdated Show resolved Hide resolved
carl/envs/brax/brax_walker_goal_wrapper.py Outdated Show resolved Hide resolved
carl/envs/brax/brax_walker_goal_wrapper.py Outdated Show resolved Hide resolved
carl/envs/brax/carl_ant.py Outdated Show resolved Hide resolved
carl/envs/brax/carl_brax_env.py Show resolved Hide resolved
carl/envs/dmc/carl_dm_pointmass.py Outdated Show resolved Hide resolved
carl/envs/dmc/carl_dm_pointmass.py Outdated Show resolved Hide resolved
carl/envs/dmc/dmc_tasks/pointmass.py Outdated Show resolved Hide resolved
self.context = None

def reset(self, seed=None, options={}):
print(self.context)
Copy link
Collaborator

Choose a reason for hiding this comment

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

print is still in

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, thought that was further up xD

@@ -50,4 +55,13 @@ def get_context_features() -> dict[str, ContextFeature]:
"mass_ffoot": UniformFloatContextFeature(
"mass_ffoot", lower=1e-6, upper=np.inf, default_value=0.8845188
),
"target_distance": UniformFloatContextFeature(
Copy link
Collaborator

Choose a reason for hiding this comment

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

default distance of 0? == no goals?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Put 100 everywhere now. That made me notice something else, though: right now by default the envs will be goal envs, I think. We should probably change that...

Copy link
Collaborator

Choose a reason for hiding this comment

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

yesss

@TheEimer TheEimer merged commit 43f1d21 into development Feb 9, 2024
2 of 5 checks passed
@TheEimer TheEimer deleted the language_goals branch February 9, 2024 11:59
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.

2 participants