fuzzyometry 0.0.3__tar.gz → 0.0.5__tar.gz

{fuzzyometry-0.0.3 → fuzzyometry-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fuzzyometry
-Version: 0.0.3
+Version: 0.0.5
 Summary: The fuzzyometry library provides smooth objects, object connections and automatic chamfer generation for xyzcad.
 Author: Stefan Helmert
 Author-email: stefan@entroserv.de

fuzzyometry-0.0.5/fuzzyometry/_version.py

@@ -0,0 +1 @@
+__version__ = "0.0.5"

{fuzzyometry-0.0.3 → fuzzyometry-0.0.5}/fuzzyometry/bodies.py

@@ -1,5 +1,5 @@
-from numba import njit
 import numpy as np
+from numba import njit
 
 
 @njit
@@ -48,9 +48,9 @@ def _fz_cuboid_ir(p, s):
 
 
 @njit
-def fz_cuboid(pnt, dimensions, r=0.):
-    #s = [e / 2 - r for e in dimensions]
-    s = np.array(dimensions) /2. - r
+def fz_cuboid(pnt, dimensions, r=0.0):
+    # s = [e / 2 - r for e in dimensions]
+    s = np.array(dimensions) / 2.0 - r
     x, y, z = pnt
     w, l, h = s
     xd = min(w - x, w + x)

{fuzzyometry-0.0.3 → fuzzyometry-0.0.5}/fuzzyometry/combinations.py

@@ -1,3 +1,4 @@
+import numpy as np
 from numba import njit
 
 
@@ -15,3 +16,13 @@ def fz_or_chamfer(r, *args):
     for a in args:
         s += max(r - a, 0) ** 2
     return r - s**0.5
+
+
+@njit
+def grad(f, p, h=0.001):
+    x, y, z, par = p
+    f0 = f(p)
+    return (
+        np.array([f((x + h, y, z, par)), f((x, y + h, z, par)), f((x, y, z + h, par))])
+        - f0
+    ) / h

{fuzzyometry-0.0.3 → fuzzyometry-0.0.5}/fuzzyometry/threads.py

@@ -5,12 +5,14 @@ from numba import njit
 @njit
 def fz_thread_profile(pnt, a=1.0):
     y = pnt[1]
-    if abs(y) > 2*a:
-        return y / 2 / a
+    if abs(y) > 2 * a:
+        return y / a
     x = pnt[0] * 2 * np.pi
-    p = a / (-0.5 * np.sin(x) + 2**-20 - 2**-19 * np.sign(np.sin(x)))
-    q = y / (np.sin(x) + 2**-20 + 2**-19 * np.sign(np.sin(x))) - 1
-    return -p / 2 - np.sign(np.sin(x)) * (max(0, (p / 2) ** 2 - q)) ** 0.5
+    sg = np.sign(np.sin(x))
+    snglr = 2**-20 - 2**-19 * sg
+    p = a / (-np.sin(x) / 2 + snglr)
+    q = y / (np.sin(x) + snglr) - 1.0
+    return -p - sg * np.sqrt(max(0, p**2 - 4 * q))
 
 
 @njit
@@ -18,7 +20,6 @@ def fz_thread(pnt, radius, n=1, profile_depth=1.0, a=1.0):
     x, y, z = pnt
     ang = -np.atan2(y, x)
     r = (x**2 + y**2) ** 0.5
-    r_arg = (r - radius)/profile_depth
+    r_arg = (r - radius) / profile_depth
     z_arg = z + n * ang / 2 / np.pi
     return profile_depth * fz_thread_profile((z_arg, r_arg), a)
-

{fuzzyometry-0.0.3 → fuzzyometry-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fuzzyometry"
-version = "0.0.3"
+version = "0.0.5"
 description = "The fuzzyometry library provides smooth objects, object connections and automatic chamfer generation for xyzcad."
 authors = ["Stefan Helmert <stefan@entroserv.de>"]
 readme = "README.md"

fuzzyometry-0.0.3/fuzzyometry/_version.py

@@ -1 +0,0 @@
-__version__ = "0.0.3"