ararpy 0.1.24__tar.gz → 0.1.25__tar.gz

{ararpy-0.1.24 → ararpy-0.1.25}/PKG-INFO

@@ -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 → ararpy-0.1.25}/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-0.1.24 → ararpy-0.1.25}/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 → ararpy-0.1.25}/ararpy.egg-info/PKG-INFO

@@ -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 → ararpy-0.1.25}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.1.24',  # version
+    version='0.1.25',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description