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

Fix controller_configs naming in documentation #138

Merged
merged 356 commits into from
Dec 14, 2020
Merged
Changes from all commits
Commits
Show all changes
356 commits
Select commit Hold shift + click to select a range
2c61c9c
removed some unneeded task files
amandlek Jun 11, 2020
91fdb99
only tabletop task class is used for all envs
amandlek Jun 11, 2020
43f37a0
remove default randomization of density and friction, only allow sett…
amandlek Jun 11, 2020
a3af23a
allow setting solimp, solref, for basic generated objects
amandlek Jun 11, 2020
ed742d6
adding damping to pick place objects to maintain consistency with before
amandlek Jun 11, 2020
5d517f3
rename generated object joints and remove base Task class
amandlek Jun 12, 2020
ea05db7
fixed panda ik rotation issue per issue #93
cremebrule Jun 12, 2020
af65134
Merge remote-tracking branch 'origin/v1.0' into v1.0
cremebrule Jun 12, 2020
3ae727e
added wipe env / tactile table arena, robot state values, sensors to …
cremebrule Jun 12, 2020
ce86fe4
fix grippers and issue #94
cremebrule Jun 12, 2020
33d23b7
fixed brittle sensor issue, as per issue #62
cremebrule Jun 12, 2020
cdca079
added dexterous three finger grippers, rotated wiping gripper
cremebrule Jun 12, 2020
ca9b088
Merge branch 'v1.0' into v1_pi
amandlek Jun 13, 2020
119cce5
Merge pull request #96 from StanfordVL/v1_pi
amandlek Jun 13, 2020
fa5b9b1
rename cylinder -> peg, fix peg color, small bimanual bug fix
cremebrule Jun 14, 2020
7d86ddc
small update to robotiq 3 finger gripper, joint torque controller
cremebrule Jun 14, 2020
9f188da
remove spurious inertial properties in gripper xmls
cremebrule Jun 16, 2020
04b20ca
updated door environment - improved appearance, randomization, and re…
cremebrule Jun 16, 2020
c389e3a
added metal textures, hammer texture, function to add textures to gen…
cremebrule Jun 17, 2020
19b0cd5
fix damping in nut assembly objects, and visual object names for pick…
amandlek Jun 17, 2020
e406b6d
added finger pad geoms, re-tuned grippers
cremebrule Jun 17, 2020
382ffab
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
cremebrule Jun 17, 2020
a44deaf
standardized ik and osc input action space to axis-angle, fix ik-rela…
cremebrule Jun 18, 2020
e6c7250
exposing ALL_GRIPPERS variable
yukezhu Jun 18, 2020
06a4f07
add gripper var per issue #1
cremebrule Jun 18, 2020
6cebb5f
added custom material functionality, improved and standardized all en…
cremebrule Jun 18, 2020
d7415a4
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
cremebrule Jun 18, 2020
f04b38f
add texture to empty arena
cremebrule Jun 18, 2020
6f997cc
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
roberto-martinmartin Jun 18, 2020
eff619c
Merge pull request #5 from Unknown-Initiative/v1.0b
roberto-martinmartin Jun 19, 2020
2f9fd7f
change TactileTableArena to WipeArena
cremebrule Jun 19, 2020
a1e9c19
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jun 19, 2020
0541edb
update robotiq85 colors
cremebrule Jun 19, 2020
8b21290
explicitly set znear in base xml
cremebrule Jun 19, 2020
b911053
allow for wipe arena resetting despite soft env resets
cremebrule Jun 19, 2020
96264aa
update jaco robot to correct finger positions and colors
cremebrule Jun 19, 2020
e940877
fix problem due to numba: the variables cannot be repurposed to have …
roberto-martinmartin Jun 19, 2020
4eae74c
added comments and removed block
roberto-martinmartin Jun 19, 2020
3ffbc84
only print if said so
roberto-martinmartin Jun 19, 2020
621104d
reward
roberto-martinmartin Jun 19, 2020
86cf348
decided on assuming max num units per step that can be wiped is 1 to …
roberto-martinmartin Jun 19, 2020
83e185b
Merge pull request #6 from Unknown-Initiative/fixing_quat2mat
roberto-martinmartin Jun 19, 2020
33edae4
Merge pull request #7 from Unknown-Initiative/robertos_wiping
cremebrule Jun 19, 2020
def1316
update jaco gripper tuning
cremebrule Jun 20, 2020
15001d9
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jun 20, 2020
9d45f47
fix robotiq140 gripper init qpos
cremebrule Jun 20, 2020
8593cf7
add dae / obj files to new robots
cremebrule Jun 21, 2020
d0b99fe
update jaco tuning
cremebrule Jun 21, 2020
e4d0f1a
rename all .STL / .DAE names to lowercase
cremebrule Jun 22, 2020
89d5ee5
yet even more jaco 3finger tuning
cremebrule Jun 22, 2020
01af650
update default controller configs
cremebrule Jun 22, 2020
b981f90
update all scripts, add pygame to extra requirements, fix controller …
cremebrule Jun 22, 2020
7196169
update arena textures
cremebrule Jun 22, 2020
619a7ed
updated all tests
cremebrule Jun 22, 2020
db99ad4
add additional textures
cremebrule Jun 22, 2020
e1fab9c
add mesh to auto-prefixing
cremebrule Jun 25, 2020
034ef88
remove pr2
cremebrule Jun 25, 2020
70527ff
add material randomization
cremebrule Jun 26, 2020
e34d3b3
remove self collisions from kinova3 and iiwa robots, remove friction …
cremebrule Jun 26, 2020
839af67
add updated robotiq85 gripper
cremebrule Jun 29, 2020
12b5306
add file-based procedurally generated default textures
cremebrule Jun 30, 2020
9913e96
update /tmp location for default-generated textures
cremebrule Jul 1, 2020
b7186f7
remove shadow from empty arena
cremebrule Jul 1, 2020
e90a809
update wall locations / textures, add new textures to library
cremebrule Jul 1, 2020
b191f20
update kinova file naming convention, robotiq85 joint range
cremebrule Jul 6, 2020
8881db0
Update bins_arena.xml
roberto-martinmartin Jul 7, 2020
b10184b
update demo scripts to handle grasp-free envs
cremebrule Jul 7, 2020
b7679d7
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jul 7, 2020
362c347
fix ik control for sawyer, add modular support for different grippers…
cremebrule Jul 8, 2020
2e8c2c5
update wall locations
cremebrule Jul 8, 2020
c265fdc
update pose action space to scaled axis angle (4 -> 3 dim)
cremebrule Jul 9, 2020
1804b1d
add error checking for gripper type selection for wipe, twoarmpeginho…
cremebrule Jul 10, 2020
9dc12fb
limit door initialization range
cremebrule Jul 10, 2020
d98e437
support for turning numba on and off
amandlek Jul 14, 2020
7c63e8b
normalize all default per-step max reward to 1.0
cremebrule Jul 14, 2020
86b5ce9
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jul 14, 2020
8483a78
do not store positions in class
amandlek Jul 14, 2020
8f53dbe
fix janky way of storing bin position in pickplace
cremebrule Jul 15, 2020
c0c6ef1
update default bin location
cremebrule Jul 15, 2020
c6dfe19
Merge pull request #10 from Unknown-Initiative/v1_no_store_pos
cremebrule Jul 16, 2020
22d48c7
functionality to get other sensor signals and the ft sensor
roberto-martinmartin Jul 20, 2020
5cb6b85
Small fix for compatibility with teleop
tungalbert99 Jul 21, 2020
5d02c94
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
tungalbert99 Jul 21, 2020
ff254b9
small error message change to controller factory
cremebrule Jul 22, 2020
afc9594
update table arena defaults
cremebrule Jul 22, 2020
a775687
wipe env overhaul: fix cylinder issue, swap table, add dirt material;…
cremebrule Jul 22, 2020
7146771
small change to gym wrapper
cremebrule Jul 22, 2020
f97b960
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jul 22, 2020
87411a1
Merge pull request #11 from Unknown-Initiative/sensor_getter
yukezhu Jul 22, 2020
0a194ad
add error checking to make sure on/offscreen renderers are not used s…
cremebrule Jul 23, 2020
2f6fc97
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jul 23, 2020
7e62154
set offscreen renderer to false for demo device control
cremebrule Jul 24, 2020
b3de1f2
rollback change to collision attrib template group num
cremebrule Jul 24, 2020
39c3afd
fix cube initialization launching issue
cremebrule Jul 27, 2020
5a361ae
fix soft reset init_qpos non IID sampling bug
cremebrule Jul 27, 2020
d723a91
fix target obj init for pick place
amandlek Jul 27, 2020
71e5e37
check for deterministic reset for hard resets
cremebrule Jul 27, 2020
5a7b3c7
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Jul 27, 2020
768e478
adding sim forward to controller update to ensure eef info is up-to-date
amandlek Jul 31, 2020
16dd5f8
fix TwoArmLift reward normalization constant
cremebrule Aug 3, 2020
a0bca10
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Aug 3, 2020
e84b7f9
add sim.forward() call to each step to fix stale sim data bug
cremebrule Aug 10, 2020
2640fb1
add hard reset functionality back in
cremebrule Aug 10, 2020
d0a64e1
update gripper action space to be binary position control with quasi …
cremebrule Aug 10, 2020
8b56fd2
update wipe env to reduce dirt generation coverage and suppress info …
cremebrule Aug 13, 2020
9b4098f
restructure demos folder
yukezhu Aug 18, 2020
5252ad8
remove deprecated docs
yukezhu Aug 18, 2020
b6a70a7
add new docs with Sphinx
yukezhu Aug 18, 2020
c989175
remove personal link and make.bat file
yukezhu Aug 18, 2020
f4be6fd
update TableTopTask --> ManipulationTask
cremebrule Aug 20, 2020
4c242a4
fix inconsistencies, naming scheme, and initialization range in two a…
cremebrule Aug 21, 2020
3911e82
remove print from two arm lift env
cremebrule Aug 22, 2020
4429d31
updating some docs
amandlek Aug 22, 2020
eba4f16
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
amandlek Aug 22, 2020
72e4c82
update wipe arena, fix wipe rewards, update wipe gripper color
cremebrule Aug 24, 2020
73fe4b5
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Aug 24, 2020
8e94d9f
update door models so random init rotation is relative to center of door
cremebrule Aug 24, 2020
473385d
update controller API docstrings
cremebrule Aug 25, 2020
9843947
update device API docstrings
cremebrule Aug 25, 2020
1c806a0
update environment API docstrings
cremebrule Aug 25, 2020
aa61583
update arena API docstrings
cremebrule Aug 25, 2020
abe429b
update gripper model API docstrings
cremebrule Aug 25, 2020
664dc9c
update objects API docstrings
cremebrule Aug 25, 2020
e41f01f
update robot model API docstrings
cremebrule Aug 25, 2020
c49bd91
update task API docstrings
cremebrule Aug 25, 2020
1d4ae2a
update MujocoXML base API docstrings
cremebrule Aug 25, 2020
2759a5c
Update controllers.md
roberto-martinmartin Aug 25, 2020
343fb2d
Update controllers.md
roberto-martinmartin Aug 25, 2020
1c892ad
Update devices.md
roberto-martinmartin Aug 25, 2020
3e341c1
fix two arm handoff check success bug
cremebrule Aug 25, 2020
e176447
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Aug 25, 2020
6a8b129
fix hammer bottom offset
cremebrule Aug 25, 2020
65a9b13
fix two arm handoff geom bug
cremebrule Aug 26, 2020
7cbeba3
update controller naming scheme
cremebrule Aug 27, 2020
d89018c
small update to handoff reward conditions
cremebrule Aug 27, 2020
387f754
update controller API docstrings
cremebrule Aug 27, 2020
88b55ca
small update to wipe env
cremebrule Aug 27, 2020
7b39212
update robot API docstrings
cremebrule Aug 27, 2020
fa0944a
update demo API docstrings + other small docstring changes
cremebrule Aug 27, 2020
d23771b
update scripts API docstrings
cremebrule Aug 27, 2020
f62c533
update utils API docstrings
cremebrule Aug 28, 2020
533fd98
update wrappers API docstrings
cremebrule Aug 28, 2020
eccf622
update misc API docstrings
cremebrule Aug 28, 2020
1b57d94
update sphinx pydoc files
cremebrule Aug 28, 2020
4e421d1
remove spin arg from quat_slerp function
cremebrule Aug 29, 2020
60bb8f9
set hard_reset=False by default on demo DR script so it doesn't crash
cremebrule Aug 29, 2020
fa577b7
add contact obs to wipe env, fix sensordata bug in robot.py
cremebrule Aug 29, 2020
0dfd55b
add authors to paper references
amandlek Aug 29, 2020
f9c4867
update overview docs and remove Surreal from names
yukezhu Aug 30, 2020
731a2ea
fix references format
yukezhu Aug 30, 2020
caac17f
fix gripper demo
yukezhu Aug 30, 2020
e933411
clean up demo scripts and documentations
yukezhu Aug 30, 2020
0d75c61
update examples of building own environments
yukezhu Aug 30, 2020
bdd483f
update gallery image
yukezhu Aug 30, 2020
0b3e652
update overall desc and add contributors
yukezhu Aug 31, 2020
10506c9
Update README.md
yukezhu Aug 31, 2020
2864551
update modules structures and remove wrappers
yukezhu Sep 1, 2020
04c55d3
update modules structures and remove wrappers
yukezhu Sep 1, 2020
2e06ff2
update tune camera/joints scripts
yukezhu Sep 2, 2020
003e1f7
update sphinx pydoc files
cremebrule Sep 2, 2020
6952cf0
add early termination option to task config for wipe env
cremebrule Sep 2, 2020
a144d72
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 2, 2020
8d412b4
fix two arm lift rewards
cremebrule Sep 2, 2020
b08e162
fix object docstring
cremebrule Sep 2, 2020
1e74bfc
add robot module overview, update sphinx pydoc files
cremebrule Sep 2, 2020
452968c
update controllers module overview
cremebrule Sep 3, 2020
2b23c59
update devices module overview doc
cremebrule Sep 3, 2020
2a290d0
update robot module overview and robot simulation api
cremebrule Sep 3, 2020
e5e98a0
fix lift reward
cremebrule Sep 3, 2020
4ca269c
removed separate renderers page. first version of sensors
Sep 3, 2020
251fef0
adding some environment docs
amandlek Sep 3, 2020
c678e7f
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
amandlek Sep 3, 2020
7268d94
update robot_module image
cremebrule Sep 3, 2020
8c6572d
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 3, 2020
38a0c82
fix docstring in demo_device_control
cremebrule Sep 3, 2020
4d1a457
removing DR todos
amandlek Sep 4, 2020
585d4cc
add _check_success() to wipe env, add default methods to robotenv and…
cremebrule Sep 4, 2020
8cd1f48
update human demo scripts and add singlearm demos
cremebrule Sep 4, 2020
ef19c0d
fix two arm lift rewards
cremebrule Sep 4, 2020
64f07ab
update environments module doc
cremebrule Sep 4, 2020
d62446e
update robots module section with model descriptions and images
cremebrule Sep 4, 2020
0864c2e
update SpaceNavigator to SpaceMouse
yukezhu Sep 5, 2020
2756475
update module overview
yukezhu Sep 6, 2020
ef3c45c
remove todo in docs
amandlek Sep 6, 2020
27f82ce
update collect human demo script
amandlek Sep 7, 2020
21a1e8b
removed iG
Sep 7, 2020
f1851a4
Controllers as pyjupyternb
Sep 7, 2020
fb39d3f
Merge branch 'v1.0' of https://github.com/Unknown-Initiative/robosuit…
Sep 7, 2020
8d92022
minor
Sep 7, 2020
17608d3
added table commented out
Sep 7, 2020
d3a1111
fix typos and consolidate styles
yukezhu Sep 7, 2020
56cdad2
remove deprecated TODOs
yukezhu Sep 7, 2020
0273598
fix minor typo
yukezhu Sep 7, 2020
64e03bf
added some env images
amandlek Sep 7, 2020
e1404c6
Merge branch 'v1.0' of github.com:Unknown-Initiative/robosuite-dev in…
yukezhu Sep 7, 2020
bfbeda4
add temp benchmarking results
cremebrule Sep 7, 2020
269304c
update robot model image locations
cremebrule Sep 7, 2020
178c2f8
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 7, 2020
e87f4d6
add sac stack benchmarking results
cremebrule Sep 8, 2020
ff0aeb7
remove Gym wrapper TODO
yukezhu Sep 8, 2020
d7afe6b
update acknowledgement with contributions of external members
yukezhu Sep 8, 2020
92c500e
Merge branch 'v1.0' of github.com:Unknown-Initiative/robosuite-dev in…
yukezhu Sep 8, 2020
28a4171
adding past contributors
yukezhu Sep 9, 2020
5cfdb53
add benchmarking results
cremebrule Sep 10, 2020
9986531
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 10, 2020
80612a4
fix q limits check for robots with infinite joint rotations (e.g.: ki…
cremebrule Sep 13, 2020
d573f3d
update two arm peg in hole
cremebrule Sep 13, 2020
f9cf8a7
update twoarmlift task reward
cremebrule Sep 13, 2020
f017695
add wipe benchmarking results
cremebrule Sep 13, 2020
53ce60a
adding more env pics for docs
amandlek Sep 14, 2020
3b10eb7
small fix to domain randomization wrapper
cremebrule Sep 15, 2020
9760e81
update sims in dr
cremebrule Sep 16, 2020
cc9c2d9
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 16, 2020
cc41ddf
fix stupid typo in dr wrapper
cremebrule Sep 16, 2020
b3cd0a1
Update README.md
yukezhu Sep 18, 2020
b987dee
Update README.md
yukezhu Sep 18, 2020
299fd6a
Update README.md
yukezhu Sep 18, 2020
dabb615
minor fixes in documentations
yukezhu Sep 18, 2020
8e43a84
add more collaborators
yukezhu Sep 18, 2020
99a3d8b
Update README.md
yukezhu Sep 18, 2020
3d42473
rename Handoff --> Handover
cremebrule Sep 21, 2020
e08f390
add snippet for placement initializers to docs
amandlek Sep 21, 2020
d571b7c
update object module sphinx doc
cremebrule Sep 21, 2020
70161b9
fix linear interpolator, remove non-axis angle option for set_goal_or…
cremebrule Sep 21, 2020
027ee99
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 21, 2020
e64d562
use model.place_objects() instead of placement_initializer.sample() i…
cremebrule Sep 21, 2020
a9ddf98
update benchmarking results in doc
cremebrule Sep 22, 2020
287d93b
pick place --> pick-and-place in benchmarking doc
cremebrule Sep 22, 2020
e341bad
update robot module figure
cremebrule Sep 22, 2020
229f11a
update wipe default num sensors to 50
cremebrule Sep 22, 2020
06f02d4
fix twoarmhandover grasping reward bug
cremebrule Sep 22, 2020
e3f9ac3
update robot module figure
yukezhu Sep 22, 2020
5bb108a
Update README.md
yukezhu Sep 23, 2020
ac59072
update robosuite title
yukezhu Sep 23, 2020
2b740fc
Merge branch 'v1.0' of github.com:Unknown-Initiative/robosuite-dev in…
yukezhu Sep 23, 2020
b1a0080
update benchmarking results in sphinx doc
cremebrule Sep 25, 2020
ebf8663
Merge remote-tracking branch 'dev/v1.0' into v1.0-dev
cremebrule Sep 25, 2020
a7ccba5
update algorithm and benchmark pages
yukezhu Sep 25, 2020
ee802af
update project metadata
yukezhu Sep 27, 2020
c6859a7
remove deprecated resources folder
yukezhu Sep 27, 2020
bbe28c8
remove redundant / unused assets
cremebrule Sep 27, 2020
dc8058c
fix demo_device_control
cremebrule Sep 27, 2020
ddf0794
fix merge conflict
yukezhu Sep 28, 2020
267d491
Merge pull request #16 from StanfordVL/v1.0
yukezhu Sep 28, 2020
7910ec1
Update README.md
yukezhu Sep 28, 2020
70c9c03
Merge branch 'master' of github.com:StanfordVL/robosuite-dev
yukezhu Oct 4, 2020
7b91954
Merge branch 'master' of github.com:ARISE-Initiative/robosuite
yukezhu Oct 6, 2020
6c43c26
Merge branch 'master' of github.com:ARISE-Initiative/robosuite
yukezhu Nov 11, 2020
620178f
Merge branch 'master' of github.com:ARISE-Initiative/robosuite
yukezhu Nov 16, 2020
3479559
update controller docs
yukezhu Dec 6, 2020
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
6 changes: 3 additions & 3 deletions docs/modules/controllers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@
"config = load_controller_config(default_controller=controller_name)\n",
"\n",
"# Create environment\n",
"env = suite.make(\"Lift\", robots=\"Panda\", controller_config=config, ... )\n",
"env = suite.make(\"Lift\", robots=\"Panda\", controller_configs=config, ... )\n",
"```\n",
"\n",
"#### Using a Custom Controller Configuration\n",
"A custom controller configuration can also be used by simply creating a new config (`.json`) file with the relevant parameters as specified above. All robosuite environments have an optional `controller_config` argument that can be used to pass in specific controller settings. Note that this is expected to be a `dict`, so the new configuration must be read in and parsed as a `dict` before passing it during the environment `robosuite.make(...)` call. A brief example script showing how to import a custom controller configuration is shown below.\n",
"A custom controller configuration can also be used by simply creating a new config (`.json`) file with the relevant parameters as specified above. All robosuite environments have an optional `controller_configs` argument that can be used to pass in specific controller settings. Note that this is expected to be a `dict`, so the new configuration must be read in and parsed as a `dict` before passing it during the environment `robosuite.make(...)` call. A brief example script showing how to import a custom controller configuration is shown below.\n",
"\n",
"```python\n",
"import robosuite as suite\n",
Expand All @@ -194,7 +194,7 @@
"config = load_controller_config(custom_fpath=controller_fpath)\n",
"\n",
"# Create environment\n",
"env = suite.make(\"Lift\", robots=\"Panda\", controller_config=config, ... )\n",
"env = suite.make(\"Lift\", robots=\"Panda\", controller_configs=config, ... )\n",
"```"
]
}
Expand Down