optimtool 2.7.1__tar.gz → 2.7.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.7.1
+Version: 2.7.2
 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
@@ -94,6 +94,8 @@ pip install optimtool>=2.5.0
 ```text
 pip install optimtool>=2.6.0
 ```
+> 建议：如果对自定义输入函数的需求比高版本中允许的输入类型检查更为强烈，推荐下载v2.4.4；如果需要在_convert.py和_typing.py中做可扩展的输入函数类型（基于sympy.core中所实现的类型），那么高版本中所作出的优化可以得到保留与体现。
+
 ## 项目结构
 
 ```textile

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

@@ -65,6 +65,8 @@ pip install optimtool>=2.5.0
 ```text
 pip install optimtool>=2.6.0
 ```
+> 建议：如果对自定义输入函数的需求比高版本中允许的输入类型检查更为强烈，推荐下载v2.4.4；如果需要在_convert.py和_typing.py中做可扩展的输入函数类型（基于sympy.core中所实现的类型），那么高版本中所作出的优化可以得到保留与体现。
+
 ## 项目结构
 
 ```textile

{optimtool-2.7.1 → optimtool-2.7.2}/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.1 requires Python >=3.7, but yours is {sys.version}')
+    raise OSError(f'optimtool-2.7.2 requires Python >=3.7, but yours is {sys.version}')

{optimtool-2.7.1 → optimtool-2.7.2}/optimtool/_convert.py

@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 from .base import np, sp
-from ._typing import FuncType, FuncArray, ArgType, ArgArray, PointType, PointArray, SympyMutableDenseMatrix, NDArray
+from ._typing import ArgType, MulType, PowerType, AddType, FuncType, FuncArray, ArgArray, PointType, PointArray, SympyMutableDenseMatrix, NDArray
 
 __all__ = ["f2m", "a2m", "p2t", "h2h"]
 
@@ -29,9 +29,9 @@ def f2m(funcs: FuncArray) -> SympyMutableDenseMatrix:
 
     :return: objective function updated with `sp.Matrix()`.
     '''
-    if isinstance(funcs, (FuncType, SympyMutableDenseMatrix)):
-        return sp.Matrix([funcs])
-    elif isinstance(funcs, (list, tuple)) and all(list(map(lambda x: isinstance(x, FuncType), funcs))):
+    if isinstance(funcs, (SympyMutableDenseMatrix, AddType, PowerType, MulType, ArgType)): # add type of FuncType to support need!
+        return sp.Matrix([funcs]) # prefer SympyMutableDenseMatrix to avoid enter into elif
+    elif isinstance(funcs, (list, tuple)) and all(list(map(lambda x: isinstance(x, (AddType, PowerType, MulType, ArgType)), funcs))):
         return sp.Matrix(funcs)
     else:
         raise RuntimeError(f"f2m not support type of funcs: {type(funcs)}.")
@@ -42,8 +42,8 @@ def a2m(args: ArgArray) -> SympyMutableDenseMatrix:
 
     :return: symbolic values updated with `sp.Matrix()`.
     '''
-    if isinstance(args, (ArgType, SympyMutableDenseMatrix)):
-        return sp.Matrix([args])
+    if isinstance(args, (SympyMutableDenseMatrix, ArgType)):
+        return sp.Matrix([args]) # prefer SympyMutableDenseMatrix to avoid enter into elif
     elif isinstance(args, (list, tuple)) and all(list(map(lambda x: isinstance(x, ArgType), args))):
         return sp.Matrix(args)
     else:

{optimtool-2.7.1 → optimtool-2.7.2}/optimtool/_typing.py

@@ -31,9 +31,12 @@ NDArray = np.ndarray # numpy.ndarray
 SympyMutableDenseMatrix = sp.matrices.dense.MutableDenseMatrix # symbolic values
 
 DataType = np.float64 # conver `object` to `float`
-
-FuncType = sp.core.add.Add
+# add type of FuncType to support need!
 ArgType = sp.core.symbol.Symbol
+MulType = sp.core.mul.Mul
+PowerType = sp.core.power.Pow
+AddType = sp.core.add.Add 
+FuncType = Union[AddType, PowerType, MulType, ArgType]
 PointType = Union[float, int]
 
 FuncArray = Union[SympyMutableDenseMatrix, FuncType, List[FuncType], Tuple[FuncType]]

{optimtool-2.7.1 → optimtool-2.7.2}/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.1'
+__version__ = '2.7.2'

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

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

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

@@ -87,13 +87,13 @@ def steihaug_CG(funcs: FuncArray,
         dk = steihaug(s0, grad, -grad, hessi, r0, epsk).astype(DataType)
         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[0][0] < p1:
+            pk = ((funv - funvk) / -(grad.dot(dk.T) + 0.5*((dk.dot(hessi)).dot(dk.T))))[0][0]
+            if pk < p1:
                 r0 *= gamma1
             else:
-                if (pk[0][0] > p2) or (np.linalg.norm(dk) == r0):
+                if (pk > p2) or (np.linalg.norm(dk) == r0):
                     r0 = min(gamma2 * r0, rmax)
-            if pk[0][0] > eta:
+            if pk > eta:
                 x_0 += dk[0]
             k += 1
         else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.7.1
+Version: 2.7.2
 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
@@ -94,6 +94,8 @@ pip install optimtool>=2.5.0
 ```text
 pip install optimtool>=2.6.0
 ```
+> 建议：如果对自定义输入函数的需求比高版本中允许的输入类型检查更为强烈，推荐下载v2.4.4；如果需要在_convert.py和_typing.py中做可扩展的输入函数类型（基于sympy.core中所实现的类型），那么高版本中所作出的优化可以得到保留与体现。
+
 ## 项目结构
 
 ```textile

{optimtool-2.7.1 → optimtool-2.7.2}/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.1 requires Python >=3.7, but yours is {sys.version}')
+    raise OSError(f'optimtool-2.7.2 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