optimtool 2.7.0__tar.gz → 2.7.1__tar.gz

{optimtool-2.7.0 → optimtool-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.7.0
+Version: 2.7.1
 Summary: The fundamental package for scientific research in optimization.
 Home-page: https://github.com/linjing-lab/optimtool
 Download-URL: https://github.com/linjing-lab/optimtool/tags
@@ -74,7 +74,7 @@ pip install optimtool --upgrade
 ```text
 pip install optimtool==2.3.5
 ```
-下载补全typing变量的版本：
+下载优化库架构并增加typing变量的版本：
 ```text
 pip install optimtool>=2.4.0
 ```

{optimtool-2.7.0 → optimtool-2.7.1}/README.md

@@ -45,7 +45,7 @@ pip install optimtool --upgrade
 ```text
 pip install optimtool==2.3.5
 ```
-下载补全typing变量的版本：
+下载优化库架构并增加typing变量的版本：
 ```text
 pip install optimtool>=2.4.0
 ```

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool/__init__.py

@@ -32,4 +32,4 @@ from .base import MATPLOTLIB_VERSION
 from ._version import __version__
 
 if sys.version_info < (3, 7, 0):
-    raise OSError(f'optimtool-2.7.0 requires Python >=3.7, but yours is {sys.version}')
+    raise OSError(f'optimtool-2.7.1 requires Python >=3.7, but yours is {sys.version}')

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool/_version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = '2.7.0'
+__version__ = '2.7.1'

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool/unconstrain/gradient_descent.py

@@ -168,7 +168,7 @@ def barzilar_borwein(funcs: FuncArray,
             x_0 = x_0 + delta
             yk = np.array(res.subs(dict(zip(args, x_0)))).astype(DataType) + dk
             alpha_up = delta.dot(delta.T)
-            alpha_down = delta.dot(yk.T)
+            alpha_down = (delta.dot(yk.T))[0]
             if alpha_down != 0:
                 alpha = alpha_up / alpha_down
             k += 1

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool/unconstrain/nonlinear_least_square.py

@@ -132,12 +132,12 @@ def levenberg_marquardt(funcr: FuncArray,
         pk_down = -(grad_f.dot(dk.T) + 0.5*((dk.dot(hess_f)).dot(dk.T)))
         pk = pk_up / pk_down
         if np.linalg.norm(dk) >= epsilon:
-            if pk < p1:
+            if pk[0][0] < p1:
                 lamk *= gamma2
             else:
-                if pk > p2:
+                if pk[0][0] > p2:
                     lamk *= gamma1
-            if pk > eta:
+            if pk[0][0] > eta:
                 x_0 += dk[0]
             k += 1
         else:

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool/unconstrain/trust_region.py

@@ -88,12 +88,12 @@ def steihaug_CG(funcs: FuncArray,
         if np.linalg.norm(dk) >= epsilon:
             funvk = np.array(funcs.subs(dict(zip(args, x_0 + dk[0])))).astype(DataType)
             pk = (funv - funvk) / -(grad.dot(dk.T) + 0.5*((dk.dot(hessi)).dot(dk.T)))
-            if pk < p1:
+            if pk[0][0] < p1:
                 r0 *= gamma1
             else:
-                if (pk > p2) or (np.linalg.norm(dk) == r0):
+                if (pk[0][0] > p2) or (np.linalg.norm(dk) == r0):
                     r0 = min(gamma2 * r0, rmax)
-            if pk > eta:
+            if pk[0][0] > eta:
                 x_0 += dk[0]
             k += 1
         else:

{optimtool-2.7.0 → optimtool-2.7.1}/optimtool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.7.0
+Version: 2.7.1
 Summary: The fundamental package for scientific research in optimization.
 Home-page: https://github.com/linjing-lab/optimtool
 Download-URL: https://github.com/linjing-lab/optimtool/tags
@@ -74,7 +74,7 @@ pip install optimtool --upgrade
 ```text
 pip install optimtool==2.3.5
 ```
-下载补全typing变量的版本：
+下载优化库架构并增加typing变量的版本：
 ```text
 pip install optimtool>=2.4.0
 ```

{optimtool-2.7.0 → optimtool-2.7.1}/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import setup
 
 if sys.version_info < (3, 7, 0):
-    raise OSError(f'optimtool-2.7.0 requires Python >=3.7, but yours is {sys.version}')
+    raise OSError(f'optimtool-2.7.1 requires Python >=3.7, but yours is {sys.version}')
 
 if (3, 7, 0) <= sys.version_info < (3, 8, 0):
     # https://github.com/pypa/setuptools/issues/926#issuecomment-294369342