Skip to content

Commit 330ded2

Browse files
[Docs] Updates tutorial.md
1 parent 453c30d commit 330ded2

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed
9.02 KB
Loading
-4.93 KB
Loading
-21.5 KB
Loading
-979 KB
Binary file not shown.

docs/src/tutorial.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ It should look like this:
4444

4545
## Loading a Robot
4646

47-
After starting the viewer, we are now ready to load a robot. Let's load a [KUKA LBR iiwa 14](https://www.kuka.com/en-gb/products/robotics-systems/industrial-robots/lbr-iiwa) with
47+
After starting the viewer, we are now ready to load a robot. Let's load a [Franka Emika](https://www.franka.de/research) research robot with
4848

4949
```@example example_1
50-
robot = TORA.create_robot_kuka_iiwa_14(vis)
50+
robot = TORA.create_robot_franka("panda_arm", vis)
5151
nothing # hide
5252
```
5353

@@ -83,15 +83,15 @@ To create a new problem, we use the [`TORA.Problem`](@ref) constructor, which ta
8383

8484
```@setup example_2
8585
```
86-
Suppose we want to optimize a motion with a total duration of *2 seconds*, and that we want to calculate the control inputs to the system at a frequency of *150 Hz*.
86+
Suppose we want to optimize a motion with a total duration of *2 seconds*, and that we want to calculate the control inputs to the system at a frequency of *100 Hz*.
8787
```@example example_2
8888
const duration = 2.0 # in seconds
89-
const hz = 150
89+
const hz = 100
9090
nothing # hide
9191
```
9292
In that case, the time step duration would be
9393
```@example example_2
94-
dt = 1/150
94+
dt = 1/100
9595
```
9696
and the total number of *knots* would be given by
9797
```@example example_2
@@ -100,7 +100,7 @@ hz * duration + 1
100100

101101
Therefore, we create the problem by running
102102
```@example example_1
103-
problem = TORA.Problem(robot, 301, 1/150)
103+
problem = TORA.Problem(robot, 201, 1/100)
104104
nothing # hide
105105
```
106106

@@ -192,7 +192,7 @@ For our circle-tracing task, we are going to define a very simple (but reasonabl
192192
First, let's define the static configuration:
193193

194194
```@example example_1
195-
initial_q = [0, 0, 0, -π/2, 0, 0, 0]
195+
initial_q = [0, 0, 0, -π/2, 0, π, 0]
196196
nothing # hide
197197
```
198198

@@ -230,7 +230,7 @@ We can concatenate these matrices into a single one:
230230
initial_guess = [initial_qs; initial_vs; initial_τs]
231231
```
232232

233-
Notice that the dimensions are `21×301`, i.e., the dimension of each knot ($\mathbb{R}^{21}$) times the 301 knots.
233+
Notice that the dimensions are `21×201`, i.e., the dimension of each knot ($\mathbb{R}^{21}$) times the 201 knots.
234234

235235
We can flatten this matrix into a vector with
236236
```@example example_1

notebooks/Tutorial.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"metadata": {},
4242
"outputs": [],
4343
"source": [
44-
"robot = TORA.create_robot_kuka_iiwa_14(vis)\n",
45-
"problem = TORA.Problem(robot, 301, 1/150)\n",
44+
"robot = TORA.create_robot_franka(\"panda_arm\", vis)\n",
45+
"problem = TORA.Problem(robot, 201, 1/100)\n",
4646
"\n",
4747
"# Constrain initial and final joint velocities to zero\n",
4848
"TORA.fix_joint_velocities!(problem, robot, 1, zeros(robot.n_v))\n",
@@ -72,7 +72,7 @@
7272
"metadata": {},
7373
"outputs": [],
7474
"source": [
75-
"initial_q = [0, 0, 0, -π/2, 0, 0, 0]\n",
75+
"initial_q = [0, 0, 0, -π/2, 0, π, 0]\n",
7676
"\n",
7777
"zero!(robot.state)\n",
7878
"set_configuration!(robot.state, initial_q)\n",

0 commit comments

Comments
 (0)