fuzzyometry 0.0.8__tar.gz → 0.0.9__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: fuzzyometry
3
- Version: 0.0.8
3
+ Version: 0.0.9
4
4
  Summary: The fuzzyometry library provides smooth objects, object connections and automatic chamfer generation for xyzcad.
5
5
  Author: Stefan Helmert
6
6
  Author-email: stefan@entroserv.de
@@ -0,0 +1 @@
1
+ __version__ = "0.0.9"
@@ -0,0 +1,43 @@
1
+ import numpy as np
2
+ from numba import njit
3
+
4
+ from fuzzyometry import combinations as cmb
5
+
6
+
7
+ @njit
8
+ def evolvente(p, param):
9
+ x, y, z = p[:3]
10
+ z, m, alpha = param
11
+ # z = 20
12
+ # m = 1
13
+ # alpha = 20 /180*np.pi
14
+ d = m * z
15
+ s = np.pi * m / 2
16
+ d_b = d * np.cos(alpha)
17
+ s_b = d_b * (s / d + np.tan(alpha) - alpha)
18
+ p_b = np.pi * d_b / z
19
+ e_b = p_b - s_b
20
+ t = 2 * np.pi / z
21
+ d_a = m * (z + 2)
22
+ d_f = m * (z - 7 / 3)
23
+ # print(f"z = {z}")
24
+ # print(f"m = {m}")
25
+ # print(f"d = {d}")
26
+ # print(f"s = {s}")
27
+ # print(f"d_b = {d_b}")
28
+ # print(f"s_b = {s_b}")
29
+ # print(f"p_b = {p_b}")
30
+ # print(f"e_b = {e_b}")
31
+ # print(f"t = {t}")
32
+ # print(f"d_f = {d_f}")
33
+
34
+ R = max((x**2 + y**2) ** 0.5 / (d_b / 2), 1)
35
+ Ra = (x**2 + y**2) ** 0.5 - d_a / 2
36
+
37
+ T = (R**2 - 1) ** 0.5
38
+ phi = T - np.arctan(T)
39
+ phi2 = abs((np.arctan2(y, x)) % t - t / 2) - t / 2 * e_b / p_b
40
+ Rf = (x**2 + y**2) ** 0.5 - d_f / 2
41
+
42
+ return cmb.fz_or_chamfer(e_b / 2, cmb.fz_and_chamfer(0.1, phi - phi2, Ra), Rf)
43
+ # return phi - phi2
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "fuzzyometry"
3
- version = "0.0.8"
3
+ version = "0.0.9"
4
4
  description = "The fuzzyometry library provides smooth objects, object connections and automatic chamfer generation for xyzcad."
5
5
  authors = ["Stefan Helmert <stefan@entroserv.de>"]
6
6
  readme = "README.md"
@@ -1 +0,0 @@
1
- __version__ = "0.0.8"
@@ -1,46 +0,0 @@
1
- import numpy as np
2
- from numba import njit
3
- from fuzzyometry import combinations as cmb
4
-
5
-
6
-
7
-
8
- @njit
9
- def evolvente(p, param):
10
- x, y, z = p[:3]
11
- z, m, alpha = param
12
- #z = 20
13
- #m = 1
14
- #alpha = 20 /180*np.pi
15
- d = m * z
16
- s = np.pi * m / 2
17
- d_b = d * np.cos(alpha)
18
- s_b = d_b * (s/d + np.tan(alpha) - alpha)
19
- p_b = np.pi * d_b / z
20
- e_b = p_b - s_b
21
- t = 2 * np.pi / z
22
- d_a = m * (z + 2)
23
- d_f = m * (z - 7/3)
24
- #print(f"z = {z}")
25
- #print(f"m = {m}")
26
- #print(f"d = {d}")
27
- #print(f"s = {s}")
28
- #print(f"d_b = {d_b}")
29
- #print(f"s_b = {s_b}")
30
- #print(f"p_b = {p_b}")
31
- #print(f"e_b = {e_b}")
32
- #print(f"t = {t}")
33
- #print(f"d_f = {d_f}")
34
-
35
-
36
- R = max((x**2 + y**2)**0.5 / (d_b/2), 1)
37
- Ra = (x**2 + y**2)**0.5 - d_a/2
38
-
39
- T = (R**2 - 1)**0.5
40
- phi = T - np.arctan(T)
41
- phi2 = abs((np.arctan2(y, x) ) % t - t/2) -t/2 * e_b / p_b
42
- Rf = (x**2 + y**2)**0.5 - d_f/2
43
-
44
- return cmb.fz_or_chamfer(e_b/2,cmb.fz_and_chamfer(0.1, phi - phi2, Ra), Rf)
45
- #return phi - phi2
46
-
File without changes