Skip to content

Commit

Permalink
TP2: 2024->2025
Browse files Browse the repository at this point in the history
  • Loading branch information
nmansard authored and nmansard committed Jan 15, 2025
1 parent befcbd1 commit 68cbd9f
Show file tree
Hide file tree
Showing 20 changed files with 7 additions and 209 deletions.
4 changes: 2 additions & 2 deletions next/2-inv_geom.ipynb → 2-inv_geom.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"metadata": {},
"outputs": [],
"source": [
"from supaero2024.meshcat_viewer_wrapper import MeshcatVisualizer, colors # noqa: E402\n",
"from supaero2025.meshcat_viewer_wrapper import MeshcatVisualizer, colors # noqa: E402\n",
"\n",
"viz = MeshcatVisualizer(robot)"
]
Expand Down Expand Up @@ -691,7 +691,7 @@
"metadata": {},
"outputs": [],
"source": [
"from supaero2024. load_ur5_parallel import load_ur5_parallel # noqa: E402\n",
"from supaero2025. load_ur5_parallel import load_ur5_parallel # noqa: E402\n",
"\n",
"robot = load_ur5_parallel()"
]
Expand Down
55 changes: 0 additions & 55 deletions next/tp2/generated/floating_1

This file was deleted.

23 changes: 0 additions & 23 deletions next/tp2/generated/invgeom3d_1

This file was deleted.

26 changes: 0 additions & 26 deletions next/tp2/generated/invgeom6d_1

This file was deleted.

8 changes: 0 additions & 8 deletions next/tp2/generated/parallel_robots_0

This file was deleted.

7 changes: 0 additions & 7 deletions next/tp2/generated/parallel_robots_1

This file was deleted.

2 changes: 0 additions & 2 deletions next/tp2/generated/parallel_robots_2

This file was deleted.

1 change: 0 additions & 1 deletion next/tp2/generated/simple_pick_and_place_1

This file was deleted.

8 changes: 0 additions & 8 deletions next/tp2/generated/simple_pick_and_place_2

This file was deleted.

10 changes: 0 additions & 10 deletions next/tp2/generated/simple_pick_and_place_3

This file was deleted.

22 changes: 0 additions & 22 deletions next/tp2/generated/simple_pick_and_place_4

This file was deleted.

9 changes: 0 additions & 9 deletions next/tp2/generated/simple_pick_and_place_5

This file was deleted.

9 changes: 0 additions & 9 deletions next/tp2/generated/simple_pick_and_place_6

This file was deleted.

22 changes: 0 additions & 22 deletions next/tp2/generated/simple_pick_and_place_7

This file was deleted.

2 changes: 1 addition & 1 deletion next/tp2/floating.py → tp2/floating.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import numpy as np
from numpy.linalg import norm
from scipy.optimize import fmin_bfgs
from supaero2024.meshcat_viewer_wrapper import MeshcatVisualizer
from supaero2025.meshcat_viewer_wrapper import MeshcatVisualizer

# --- Load robot model
# Solo12 is a quadruped robot. Its configuration is composed of:
Expand Down
2 changes: 1 addition & 1 deletion next/tp2/invgeom3d.py → tp2/invgeom3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import numpy as np
from numpy.linalg import norm
from scipy.optimize import fmin_bfgs
from supaero2024.meshcat_viewer_wrapper import MeshcatVisualizer
from supaero2025.meshcat_viewer_wrapper import MeshcatVisualizer

# --- Load robot model
robot = robex.load("ur5")
Expand Down
2 changes: 1 addition & 1 deletion next/tp2/invgeom6d.py → tp2/invgeom6d.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import pinocchio as pin
from numpy.linalg import norm
from scipy.optimize import fmin_bfgs
from supaero2024.meshcat_viewer_wrapper import MeshcatVisualizer
from supaero2025.meshcat_viewer_wrapper import MeshcatVisualizer

# --- Load robot model
robot = robex.load("ur5")
Expand Down
4 changes: 2 additions & 2 deletions next/tp2/parallel_robots.py → tp2/parallel_robots.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import pinocchio as pin

# %jupyter_snippet 0
from supaero2024.load_ur5_parallel import load_ur5_parallel
from supaero2024.meshcat_viewer_wrapper import MeshcatVisualizer
from supaero2025.load_ur5_parallel import load_ur5_parallel
from supaero2025.meshcat_viewer_wrapper import MeshcatVisualizer

# Load 4 Ur5 robots, placed at 0.3m from origin in the 4 directions x,y,-x,-y.
robot = load_ur5_parallel()
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 68cbd9f

Please sign in to comment.