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.

Sign up for GitHub

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

Jump to bottom

feat: Energy consumption wrapper #65

Merged
merged 117 commits into from
May 3, 2024
Merged

feat: Energy consumption wrapper #65

merged 117 commits into from
May 3, 2024

Conversation

iwishiwasaneagle
Copy link
Owner

No description provided.

@codecov
Copy link

codecov bot commented Jun 22, 2023 •
edited
Loading

Codecov Report

Attention: Patch coverage is 96.62921% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 82.28%. Comparing base (4abb833) to head (e1cdc81).
Report is 10 commits behind head on master.

Files Patch % Lines
src/jdrones/envs/base/basedronenev.py 50.00% 1 Missing and 1 partial ⚠️
src/jdrones/envs/base/basecontrolledenv.py 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master      #65      +/-   ##
==========================================
+ Coverage   75.97%   82.28%   +6.30%     
==========================================
  Files          19       21       +2     
  Lines         974     1061      +87     
  Branches       89       95       +6     
==========================================
+ Hits          740      873     +133     
+ Misses        223      177      -46     
  Partials       11       11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

iwishiwasaneagle and others added 22 commits February 22, 2024 10:27
@iwishiwasaneagle
chore: Add a fifth action that controls the scaling of the propeller …
17a6e79 
…actions
@iwishiwasaneagle
Merge branch 'master' into dev-energy
48c45aa
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
e26e045 
for more information, see https://pre-commit.ci
@iwishiwasaneagle
chore: Switch to using "unwrapped"
a5467e2
@iwishiwasaneagle
Merge branch 'dev-energy' of github.com:iwishiwasaneagle/jdrones into…
42f40dc 
… dev-energy
@iwishiwasaneagle
chore: Import order
d6f9879
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
bc996eb 
for more information, see https://pre-commit.ci
@iwishiwasaneagle
fix: Check for different env types
5aae992
@iwishiwasaneagle
fix: Check for different env types
d24b766
@iwishiwasaneagle
Merge branch 'dev-energy' of github.com:iwishiwasaneagle/jdrones into…
847356e 
… dev-energy
@iwishiwasaneagle
chore: Further edits to energy example
5371a38
@iwishiwasaneagle
chore: Try out sbx
556968c
@iwishiwasaneagle
Merge branch 'master' into dev-energy
e5453b6
@iwishiwasaneagle
chore: Update types
28f728c
@iwishiwasaneagle
fix: Legacy imports
f6f196c
@iwishiwasaneagle
chore: Allow a reset state to be given within options
11bc080
@iwishiwasaneagle
feat: A working DRL example with plotting
2e42527
@iwishiwasaneagle
feat: Use optuna for hyperparameter sweep in DRL example
f244822
@iwishiwasaneagle
refactor: Example got too big, so split into sub-modules
3960e07
@iwishiwasaneagle
feat: A working DRL example with plotting
34014e2
@iwishiwasaneagle
feat: Add wandb to example
a5204d3
@iwishiwasaneagle
chore: Make sure num_timesteps is set properly
8127e41
iwishiwasaneagle and others added 28 commits March 29, 2024 14:11
@iwishiwasaneagle
feat: Change LQR tuner to be velocity centric
c0f4849
@iwishiwasaneagle
fix: Re-added is_success logging
f429dd1
@iwishiwasaneagle
feat: Add 2D plot to graphing callback
38b4a5e
@iwishiwasaneagle
feat: Swap to velocity-based action space
3afe0a2
@iwishiwasaneagle
Merge branch 'dev-energy' of github.com:iwishiwasaneagle/jdrones into…
8ec4795 
… dev-energy
@iwishiwasaneagle
chore: plot targets
783177c
@iwishiwasaneagle
chore: Switch to a heading-velocity scheme and reintroduce the contro…
e8a4fb7 
…l action penalty
@iwishiwasaneagle
fi: Switch to vector-based velocity method
04ea745
@iwishiwasaneagle
refactor: Remove old env and optuna sweeps
14090b4
@iwishiwasaneagle
feat: Add colors and circles to 2D position plot to show the targets,…
e8d6e71 
… their radius and order
@iwishiwasaneagle
fix: Enable policy net_arch for RecurrentPPO to be customizable from …
dcea513 
…the CLI
@iwishiwasaneagle
chore: set squash_output to true when using SDE
a265f65
@iwishiwasaneagle
fix: success distance is 1 not 1.5
32e96bd
@iwishiwasaneagle
feat: Multi-env DRL
d21b26d
@iwishiwasaneagle
fix: Don't break the loop if a target is reached to ensure that time …
7a2db4a 
…stays synchronized
@iwishiwasaneagle
fix: Switch to SB3's DummyVecEnv to handle the multi-env logic
29bbe52
@iwishiwasaneagle
feat: Extend to any n env
04d3e72
@iwishiwasaneagle
fix: Properly handle collision reward
703274e
@iwishiwasaneagle
refactor: Handle rewards normalization in the top-level env
8bfc7a7
@iwishiwasaneagle
feat: Number of sub-envs from CLI
91209c0
@iwishiwasaneagle
chore: Rename env to be more representative of what it is
db08c1a
@iwishiwasaneagle
fix: Ensure eval env is the same as training env
3a7833f
@iwishiwasaneagle
fix: Re-include time in the observation
a5c30e4
@iwishiwasaneagle
fix: Ensure observation is (1,X) in shape
a7ee23c
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
370fbf1 
for more information, see https://pre-commit.ci
@iwishiwasaneagle
chore: Pass total sim time to the mult DRL env
6040eca
@iwishiwasaneagle
feat: tensorboard and optuna for the 3d drl example
73bed0d
@iwishiwasaneagle
doc: quick readme for the drl example
e1cdc81
@iwishiwasaneagle iwishiwasaneagle merged commit 570e171 into master May 3, 2024
13 checks passed
@iwishiwasaneagle iwishiwasaneagle deleted the dev-energy branch May 3, 2024 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@iwishiwasaneagle