ikpy 3.3.4__tar.gz → 3.4.2__tar.gz

{ikpy-3.3.4/src/ikpy.egg-info → ikpy-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ikpy
-Version: 3.3.4
+Version: 3.4.2
 Summary: An inverse kinematics library aiming performance and modularity
 Home-page: https://github.com/Phylliade/ikpy
 Classifier: Programming Language :: Python :: 3
@@ -111,16 +111,14 @@ Contributions are welcome: if you have an awesome patented \(but also open-sourc
 If you use IKPy as part of a publication, please use the Bibtex below as a citation:
 
 ```bibtex
-@software{manceron_pierre_2022_6551158,
+@software{manceron_2024_13256291,
   author       = {Manceron, Pierre},
   title        = {IKPy},
-  month        = may,
-  year         = 2022,
-  note         = {{If you use this software, please cite it using the 
-                   metadata from this file.}},
+  month        = aug,
+  year         = 2024,
   publisher    = {Zenodo},
-  version      = {v3.3.3},
-  doi          = {10.5281/zenodo.6551158},
-  url          = {https://doi.org/10.5281/zenodo.6551158}
+  version      = {v3.4},
+  doi          = {10.5281/zenodo.13256291},
+  url          = {https://doi.org/10.5281/zenodo.13256291}
 }
 ```

{ikpy-3.3.4 → ikpy-3.4.2}/README.md

@@ -100,16 +100,14 @@ Contributions are welcome: if you have an awesome patented \(but also open-sourc
 If you use IKPy as part of a publication, please use the Bibtex below as a citation:
 
 ```bibtex
-@software{manceron_pierre_2022_6551158,
+@software{manceron_2024_13256291,
   author       = {Manceron, Pierre},
   title        = {IKPy},
-  month        = may,
-  year         = 2022,
-  note         = {{If you use this software, please cite it using the 
-                   metadata from this file.}},
+  month        = aug,
+  year         = 2024,
   publisher    = {Zenodo},
-  version      = {v3.3.3},
-  doi          = {10.5281/zenodo.6551158},
-  url          = {https://doi.org/10.5281/zenodo.6551158}
+  version      = {v3.4},
+  doi          = {10.5281/zenodo.13256291},
+  url          = {https://doi.org/10.5281/zenodo.13256291}
 }
 ```

ikpy-3.4.2/src/ikpy/_version.py

@@ -0,0 +1 @@
+__version__ = '3.4.2'

{ikpy-3.3.4 → ikpy-3.4.2}/src/ikpy/inverse_kinematics.py

@@ -34,8 +34,8 @@ def inverse_kinematic_optimization(chain, target_frame, starting_nodes_angles, r
         Do not optimize against position
     optimizer: str
         The optimizer to use. Choices:
-        * "least_squares": Use scipy.optimize.least_squares
-        * "scalar": Use scipy.optimize.minimize
+        * "least_squares": Use scipy.optimize.least_squares (the default)
+        * "scalar": Use scipy.optimize.minimize (the default prior to IKPy 3.3)
     """
     if optimizer not in ["least_squares", "scalar"]:
         raise ValueError("Unknown solver: {}".format(optimizer))
@@ -53,7 +53,7 @@ def inverse_kinematic_optimization(chain, target_frame, starting_nodes_angles, r
 
     # Compute error to target
     def optimize_target_function(fk):
-        target_error = fk[:3, -1] - target
+        target_error = (fk[:3, -1] - target)
 
         # We need to return the fk, it will be used in a later function
         # This way, we don't have to recompute it

{ikpy-3.3.4 → ikpy-3.4.2}/src/ikpy/link.py

@@ -40,6 +40,7 @@ class Link:
         self.axis_length = length
         self.is_final = is_final
         self.has_rotation = False
+        self.has_translation = False
         self.joint_type = None
 
     def __repr__(self):
@@ -267,7 +268,12 @@ class DHLink(Link):
     d: float
         offset along previous z to the common normal
     a: float
-        offset along previous   to the common normal
+        length of the common normal (do not confuse with alpha)
+        Assuming a revolute joint, this is the radius about previous z
+    alpha: float
+        angle about common normal, from old z axis to new z axis
+    theta: float
+        angle about previous z, from old x to new x
     use_symbolic_matrix: bool
         whether the transformation matrix is stored as Numpy array or as a Sympy symbolic matrix.
 
@@ -277,10 +283,12 @@ class DHLink(Link):
         The link object
     """
 
-    def __init__(self, name, d=0, a=0, bounds=None, use_symbolic_matrix=True):
-        Link.__init__(self, use_symbolic_matrix)
+    def __init__(self, name=None, d=0, a=0, alpha=0, theta=0, bounds=None, use_symbolic_matrix=True, length=0):
+        Link.__init__(self, use_symbolic_matrix, length=length)
         self.d = d
         self.a = a
+        self.alpha = alpha
+        self.theta = theta
 
     def get_link_frame_matrix(self, parameters):
         """ Computes the homogeneous transformation matrix for this link. """

{ikpy-3.3.4 → ikpy-3.4.2/src/ikpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ikpy
-Version: 3.3.4
+Version: 3.4.2
 Summary: An inverse kinematics library aiming performance and modularity
 Home-page: https://github.com/Phylliade/ikpy
 Classifier: Programming Language :: Python :: 3
@@ -111,16 +111,14 @@ Contributions are welcome: if you have an awesome patented \(but also open-sourc
 If you use IKPy as part of a publication, please use the Bibtex below as a citation:
 
 ```bibtex
-@software{manceron_pierre_2022_6551158,
+@software{manceron_2024_13256291,
   author       = {Manceron, Pierre},
   title        = {IKPy},
-  month        = may,
-  year         = 2022,
-  note         = {{If you use this software, please cite it using the 
-                   metadata from this file.}},
+  month        = aug,
+  year         = 2024,
   publisher    = {Zenodo},
-  version      = {v3.3.3},
-  doi          = {10.5281/zenodo.6551158},
-  url          = {https://doi.org/10.5281/zenodo.6551158}
+  version      = {v3.4},
+  doi          = {10.5281/zenodo.13256291},
+  url          = {https://doi.org/10.5281/zenodo.13256291}
 }
 ```

{ikpy-3.3.4 → ikpy-3.4.2}/src/ikpy.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ src/ikpy/utils/__init__.py
 src/ikpy/utils/geometry.py
 src/ikpy/utils/plot.py
 tests/test_chain.py
+tests/test_chain_dh.py
 tests/test_orientation.py
 tests/test_poppy_robots.py
 tests/test_urdf.py

ikpy-3.4.2/tests/test_chain_dh.py

@@ -0,0 +1,55 @@
+from ikpy.chain import Chain
+from ikpy.link import OriginLink, DHLink
+from ikpy.utils import plot
+
+import matplotlib.pyplot as plt
+
+import numpy as np
+from math import pi
+
+class UR10():
+    def __init__(self):
+        self.robot_name = 'UR10'
+        self.home_config = [0, -pi/2, 0, -pi/2, 0, 0] 
+        self.dh_params = np.array([
+            [  0.1273, 0., pi/2, 0.],
+            [  0., -0.612, 0, 0.],
+            [  0., -0.5723, 0, 0.],
+            [  0.163941, 0.,  pi/2, 0.],
+            [  0.1147, 0.,  -pi/2, 0.],
+            [  0.0922, 0., 0, 0.]])   
+        
+        self.joint_limits =  [
+                        (-360, 360),  
+                        (-360, 360),  
+                        (-360, 360),  
+                        (-360, 360),  
+                        (-360, 360),  
+                        (-360, 360)] 
+        
+def create_dh_robot(robot):
+    # Create a list of links for the robot
+    links = []
+    for i, dh in enumerate(robot.dh_params):
+        link = DHLink(d=dh[0], a=dh[1], alpha=dh[2], theta=dh[3], length=abs(dh[1]))
+        link.bounds = robot.joint_limits[i]
+        links.append(link)
+
+    # Create a chain using the robot links
+    chain = Chain(links, name=robot.robot_name)
+    return chain
+
+
+def test_dh_chain():
+    robot = UR10()
+    chain = create_dh_robot(robot)
+    frame = [[1.112918581, -0.209413742, 0.19382176], [0.0, 1.0, 0.0]]
+    target_position, target_orientation = frame
+    joint_angles = chain.inverse_kinematics(target_position=target_position, target_orientation=target_orientation, orientation_mode="Z")
+
+    print(joint_angles)
+
+    fig, ax = plot.init_3d_figure()
+    chain.plot(robot.home_config, ax)
+    chain.plot(joint_angles, ax)
+    plt.savefig("out/UR10.png")

ikpy-3.3.4/src/ikpy/_version.py

@@ -1 +0,0 @@
-__version__ = '3.3.4'