ararpy 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.24'
+version = '0.1.25'
 __version__ = version
 full_version = version
-last_update = '2024-03-28'
+last_update = '2024-05-20'
 
 """ ArArPy Functions """
 

ararpy/calc/regression.py

@@ -794,39 +794,31 @@ def power(a0: list, a1: list):
     def _pow_func(x, a, b, c):
         return a * x ** b + c
 
-    def _solve_pow(params):
+    def _residuals(params):
         a, b, c = params
-        x, y = [0, 0, 0], [0, 0, 0]
-        x[0] = sum(a1[:3]) / 3
-        y[0] = sum(a0[:3]) / 3
-        x[1] = sum(a1) / len(a1)
-        y[1] = sum(a0) / len(a0)
-        x[2] = sum(a1[-3:]) / 3
-        y[2] = sum(a0[-3:]) / 3
-        return np.array([
-            _pow_func(x[0], a, b, c) - y[0],
-            _pow_func(x[1], a, b, c) - y[1],
-            _pow_func(x[2], a, b, c) - y[2],
-        ])
-
-    def _get_sum(a, b, c):
-        y_predicted = [_pow_func(_x, a, b, c) for _x in a1]
-        return sum([(y_predicted[i] - a0[i]) ** 2 for i in range(len(a0))])
+        return [_pow_func(xi, a, b, c) - yi for xi, yi in zip(a1, a0)]
+
+    def _sum_squared_error(params):
+        return sum(r**2 for r in _residuals(params))
 
     def _get_abc(b):  # Return a, b, c given b based on linest regression
         f = linest(a0, [_x ** b for _x in a1])
         return f[5][1], b, f[0]
 
+    def _get_init():
+        f = linest(np.log(np.array(a0)), np.log(np.array(a1)))
+        return np.exp(f[0]), f[5][1], 0
+
     try:
-        a, b, c = fsolve(func=_solve_pow, x0=np.array([1, 1, 1]))  # initial estimate
+        a, b, c = _get_init()  # initial estimate
         count = 0
         step = 0.01
         while count < 100:
             a, b, c = _get_abc(b)
-            s = _get_sum(a, b, c)
+            s = _sum_squared_error([a, b, c])
             b_left, b_right = b - step * b, b + step * b
-            s_left = _get_sum(*_get_abc(b_left))
-            s_right = _get_sum(*_get_abc(b_right))
+            s_left = _sum_squared_error(_get_abc(b_left))
+            s_right = _sum_squared_error(_get_abc(b_right))
             if s_left > s > s_right:
                 b = b_right
                 continue
@@ -886,39 +878,32 @@ def exponential(a0: list, a1: list):
     def _exp_func(x, a, b, c):
         return a * b ** x + c
 
-    def _solve_exp(params):
+    def _residuals(params):
         a, b, c = params
-        x, y = [0, 0, 0], [0, 0, 0]
-        x[0] = sum(a1[:3]) / 3
-        y[0] = sum(a0[:3]) / 3
-        x[1] = sum(a1) / len(a1)
-        y[1] = sum(a0) / len(a0)
-        x[2] = sum(a1[-3:]) / 3
-        y[2] = sum(a0[-3:]) / 3
-        return np.array([
-            _exp_func(x[0], a, b, c) - y[0],
-            _exp_func(x[1], a, b, c) - y[1],
-            _exp_func(x[2], a, b, c) - y[2],
-        ])
-
-    def _get_sum(a, b, c):
-        y_predicted = [_exp_func(_x, a, b, c) for _x in a1]
-        return sum([(y_predicted[i] - a0[i]) ** 2 for i in range(len(a0))])
+        return [_exp_func(xi, a, b, c) - yi for xi, yi in zip(a1, a0)]
+
+    def _sum_squared_error(params):
+        return sum(r**2 for r in _residuals(params))
 
     def _get_ac(b):
-        f = linest(a0, [b ** _x for _x in a1])
+        f = linest(a0, [b ** xi for xi in a1])
         return f[5][1], b, f[0]
 
+    def _get_init():
+        f = linest(np.log(np.array(a0)), np.array(a1))
+        return np.exp(f[0]), np.exp(f[5][1]), 0
+
     try:
-        a, b, c = fsolve(_solve_exp, np.array([1, 1, 1]))
+        a, b, c = _get_init()
+        # a, b, c = minimize(_sum_squared_error, [a, b, c], method="Nelder-Mead").x  # 优化方法
         count = 0
         step = 0.01
         while count < 100:
             a, b, c = _get_ac(b)
-            s = _get_sum(a, b, c)
+            s = _sum_squared_error([a, b, c])
             b_left, b_right = b - step * b, b + step * b
-            s_left = _get_sum(*_get_ac(b_left))
-            s_right = _get_sum(*_get_ac(b_right))
+            s_left = _sum_squared_error(_get_ac(b_left))
+            s_right = _sum_squared_error(_get_ac(b_right))
             if s_left > s > s_right:
                 b = b_right
                 continue

{ararpy-0.1.24.dist-info → ararpy-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.24
+Version: 0.1.25
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.24.dist-info → ararpy-0.1.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ararpy/__init__.py,sha256=QEp5L28BpSsG8M5Od5bV8kEffBsktW19SvENTbtQ_v4,6857
+ararpy/__init__.py,sha256=IaTaNQCT51JP-Xn9mL40aPYSjWqEPbZAtHp0nkoS52c,6857
 ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
 ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
 ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
@@ -11,7 +11,7 @@ ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
 ararpy/calc/jvalue.py,sha256=OL5zPYU8Pac-wOxUWPCgu3onh2n01xDnhpi2mlUsjJM,1146
 ararpy/calc/plot.py,sha256=sUqjKBdAEjFarUoSCLqf8cbUM0rEAdZhmtyXB2K7LkA,2139
 ararpy/calc/raw_funcs.py,sha256=UC01lvA6GyZ5FJv43jgoUULAFoLnZJMxeSa0BeVFCAM,2637
-ararpy/calc/regression.py,sha256=w5kni6LGqvISvlvbBZnJ3N2c5eQjgkz3bBbj0PXPyGs,40251
+ararpy/calc/regression.py,sha256=mHUKobKx-Q9c7E49vPoQA2tA-MwO9BWvCp3VfnuUhUA,39776
 ararpy/calc/spectra.py,sha256=_Q23eP9necHlaCoHf3_UfW1N3JmVZj5rcWFro8GS-CA,1995
 ararpy/examples/022_VU124-M11a.ahd,sha256=3m0Gd-ZObou3KsnRNFMf77QwzT1Uz3nu3vA33Sqeyng,5414
 ararpy/examples/20WHA0103.age,sha256=cT-a4d7Wt77aotx6v0G47vulY_TZIcZUcaVHB3pqTPM,380416
@@ -59,8 +59,8 @@ ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=Q97zfe2h2RaxADkoBAqd0uEiP16BFOajrTmXHMkL2EQ,25502
 ararpy/thermo/basic.py,sha256=nBGHI9uK7VdJwThwBIOcKAzdnYqPyQseFoY6s4zKizk,11504
-ararpy-0.1.24.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.24.dist-info/METADATA,sha256=ugp-dLJNZMSuugSyvAvFUrki9T4VUfys5Cv9lpz8DIM,24516
-ararpy-0.1.24.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-ararpy-0.1.24.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.24.dist-info/RECORD,,
+ararpy-0.1.25.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.25.dist-info/METADATA,sha256=_jTZMLzib2249ffidHh8OG0E3stzFUz9LXDlIRkQNzk,24516
+ararpy-0.1.25.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+ararpy-0.1.25.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.25.dist-info/RECORD,,