Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
57a07cc
basic structure created for later improvement
rojas70 Jun 17, 2025
d8709a4
removed unnecessary directories, finished basic structure (conserved …
rojas70 Jun 17, 2025
da07bec
uncommented lines that weld mocap body and body together. This is nec…
rojas70 Jun 17, 2025
1434f2a
v0.1 initial train and test files included
rojas70 Jun 17, 2025
4000766
example train.py added
rojas70 Jun 17, 2025
f40fd14
Modified train.py, test.py, and pick_and_place.py
crosen77 Jun 18, 2025
ff6b85a
Update README.md
ryanvanderstelt Jun 18, 2025
141fe7c
Added train_advanced.py
crosen77 Jun 18, 2025
317e0ba
updated import pick_n_place.py
ryanvanderstelt Jun 18, 2025
e95cce8
files for slide and updated training
crosen77 Jun 18, 2025
b5f3846
Update .gitignore
ryanvanderstelt Jun 18, 2025
20bdc2e
In this merge we have successfuly accomplished testing push and slide…
crosen77 Jun 18, 2025
66a1628
Update README.md
ryanvanderstelt Jun 18, 2025
e88b9e3
updated import pick_n_place.py
ryanvanderstelt Jun 18, 2025
6d7d7f8
Update .gitignore
ryanvanderstelt Jun 18, 2025
32ee94d
train.py working, updated requirements.txt
ryanvanderstelt Jun 18, 2025
eeee883
basic train and test
ryanvanderstelt Jun 18, 2025
051dfc3
small changes to train file
ryanvanderstelt Jun 19, 2025
d027611
example train.py added
rojas70 Jun 17, 2025
470ed72
train.py working, updated requirements.txt
ryanvanderstelt Jun 18, 2025
1cd195b
basic train and test
ryanvanderstelt Jun 18, 2025
f49d491
small changes to train file
ryanvanderstelt Jun 19, 2025
9c9bca0
added main function to train_advanced, updated requirements
ryanvanderstelt Jun 19, 2025
fe542b4
A setup.py is needed at the top of the repo that includes the names o…
rojas70 Jun 19, 2025
f00b8d7
In order to get HER to work in train_advanced with stable baselines 2…
rojas70 Jun 19, 2025
eee0eb4
updated .gitignore
ryanvanderstelt Jun 19, 2025
dea5933
updated .gitignore
ryanvanderstelt Jun 19, 2025
42c02f2
added setup.py
ryanvanderstelt Jun 19, 2025
470b593
updated .gitignore
ryanvanderstelt Jun 19, 2025
9973708
Merge remote-tracking branch 'origin/push_tqc'
ryanvanderstelt Jun 19, 2025
ea7955d
conflict fix
rojas70 Jun 19, 2025
26f163d
Varied hyperparameters to improve vectorized environment performance.
rojas70 Jun 20, 2025
8d7540d
Tried to get rid of bool warning
rojas70 Jun 20, 2025
b3a86f0
fixed conflict in requirements by including the rich package
rojas70 Jun 20, 2025
c35dec1
Updated evaluation parameters to have more meaningful evaluation and …
rojas70 Jun 20, 2025
e68902f
corrected total_Timesteps. Had been changed to 10,000. Should be 500,…
rojas70 Jun 20, 2025
b2921ce
corrected learning_starts to include a vectorized number. That is: nu…
rojas70 Jun 20, 2025
6307f26
Update README.md
rojas70 Jun 20, 2025
2cf21d5
use data folder to log data
rojas70 Jun 23, 2025
86585f1
Merge branch 'master' of https://github.com/learningLogisticsLab/fran…
rojas70 Jun 23, 2025
7545712
We inserted VecNormalize to training and evaluation environments. We …
rojas70 Jun 23, 2025
a6f82f7
Merge branch 'vec_env_debug' of github.com:learningLogisticsLab/frank…
rojas70 Jun 23, 2025
6d5bacb
Added train_advanced_single.py, which takes the functionality of the …
rojas70 Jun 23, 2025
5ad961f
minor change
rojas70 Jun 23, 2025
ad5fdec
resolved conflict
rojas70 Jun 23, 2025
7641203
fixed error with closing environments
rojas70 Jun 23, 2025
a554090
Merge branch 'master' of github.com:learningLogisticsLab/franka_mujoco
rojas70 Jun 23, 2025
e8aec2d
preliminary change to 2 phases. still untested.
rojas70 Jun 23, 2025
7a76bcd
v. 0.1. pick_and_place demo script.
rojas70 Jun 24, 2025
f280151
Modified train_advanced_single.py, train_advanced.py, and train.py to…
rojas70 Jun 24, 2025
1c3297e
v. 0.2. Sliding Friction
rojas70 Jun 24, 2025
139906c
v. 0.3. Changes to `panda_mocap.xml` inside the top‐level `<option>`…
rojas70 Jun 25, 2025
e3a2c8d
v. 0.4 Implemented Welds and Improved condition checks, resets, and r…
rojas70 Jun 25, 2025
2324f19
v. 0.5. file saving
rojas70 Jun 25, 2025
65c62b2
Merge branch 'demos'
rojas70 Jun 25, 2025
b135045
Added advanced naming for logs in train.py and made very minimal chan…
rojas70 Jun 25, 2025
6aad8a1
removing deleted files
rojas70 Jun 25, 2025
c095f4f
Added advanced naming for logs in train.py and copied train_advanced_…
rojas70 Jun 25, 2025
5dc0722
Copied train_advanced_single from the push folder and made necesary n…
rojas70 Jun 25, 2025
3d57b97
Merge branch 'fix_broken_pipe'
rojas70 Jun 25, 2025
1bdcc72
Merge branch 'master' of github.com:learningLogisticsLab/franka_mujoco
rojas70 Jun 25, 2025
c8a73d6
Merge branch 'master' into demos
rojas70 Jun 25, 2025
05e0169
renamed demo script
rojas70 Jun 25, 2025
76c5959
v. 0.6.0
rojas70 Jun 25, 2025
8f97f28
v.0.7.0 Complete code to load demonstrations into replay buffer to le…
rojas70 Jun 26, 2025
593dfd4
Update README.md
rojas70 Jun 26, 2025
1f45992
v. 0.8.0 improving log path settings
rojas70 Jun 26, 2025
8e19fe7
Ignore npz compressed files
rojas70 Jun 26, 2025
dfa4e29
further updates to where demo files are saved.
rojas70 Jun 26, 2025
dac5824
Ensured all files can be written/read from /home/student/data/franka_…
rojas70 Jun 26, 2025
c5aef69
min changes
rojas70 Jun 26, 2025
83a6f04
changing all file properties to 777 to enable cross user handling. Pa…
rojas70 Jun 26, 2025
2c229fa
Merge branch 'demos'
rojas70 Jun 28, 2025
4125a05
fixed error in model.save
rojas70 Oct 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
11 changes: 10 additions & 1 deletion .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
.vscode
.history
.pytest_cache
.DS_Store
.zip
.npz # numpy compressed files
*__pycache__
trained_model/
test_model/
figs/
logs/
new_logs/
new_logs/
dependency_links.txt
not-zip-safe
PKG-INFO
requires.txt
SOURCES.txt
top_level.txt
Empty file modified LICENSE
100644 → 100755
Empty file.
30 changes: 28 additions & 2 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,34 @@ There is still a lot of work to be done on this repo, so please feel free to rai
</div>

## Installation
Create a virtual environment for python 3.10:
```
conda create --name fm_env python==3.10
```
### Activate your environment:
```
conda activate fm_env
```

And now set python interpreter paths and install dependencies
```
cd franka_mujoco
pip install -e .
pip install -r requirements.txt
```

### Create an fm_env alias
For convenience, you can create an alias in your .bashrc/.zshrc file to quickly load the environment and cd to a desired folder:
```
gedit ~/.bashrc # or gedit ~/.zshrc

All essential libraries with corresponding versions are listed in [`requirements.txt`](requirements.txt).
# Go to the last line and type
alias fm_env="conda activate fm_env; cd ~/code/franka_mujoco"
# Save and exit your file

# Activate new .bashrc file by calling the following command in your terminal
source .bashrc # or source .zshrc
```

## Test

Expand Down Expand Up @@ -65,4 +91,4 @@ If you use this repo in your work, please cite:
archivePrefix={arXiv},
primaryClass={cs.RO}
}
```
```
Binary file added demos/data_franka_random_10.npz
Binary file not shown.
Loading