optimtool 2.9.0__tar.gz → 2.9.1__tar.gz

{optimtool-2.9.0 → optimtool-2.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.9.0
+Version: 2.9.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
@@ -61,7 +61,7 @@ License-File: LICENSE
   author       = {Lin, Jing},
   title        = {optimtool: The fundamental package for scientific research in optimization.},
   year         = {2021},
-  version      = {2.8.3},
+  version      = {2.9.1},
   publisher    = {PyPI},
   organization = {linjing-lab},
   url          = {https://pypi.org/project/optimtool/},

{optimtool-2.9.0 → optimtool-2.9.1}/README.md

@@ -32,7 +32,7 @@
   author       = {Lin, Jing},
   title        = {optimtool: The fundamental package for scientific research in optimization.},
   year         = {2021},
-  version      = {2.8.3},
+  version      = {2.9.1},
   publisher    = {PyPI},
   organization = {linjing-lab},
   url          = {https://pypi.org/project/optimtool/},

{optimtool-2.9.0 → optimtool-2.9.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.8.2 requires Python >=3.7, but yours is {sys.version}')
+    raise OSError(f'optimtool-2.9.1 requires Python >=3.7, but yours is {sys.version}')

{optimtool-2.9.0 → optimtool-2.9.1}/optimtool/_drive.py

@@ -167,40 +167,35 @@ def cons_unequal_L(cons_unequal: SympyMutableDenseMatrix,
             sub = sub - (muk[i] / sigma)**2
     return sp.Matrix([sub])
 
-def v_k(cons_equal: SympyMutableDenseMatrix, 
-        cons_unequal: SympyMutableDenseMatrix, 
-        args: SympyMutableDenseMatrix, 
+def v_k(cons_equal_num, 
+        cons_unequal_num, 
+        len_cons: int,
         muk: NDArray, 
         sigma: float, 
         x_0: IterPointType) -> DataType:
     sub = 0.
     # reps = dict(zip(args, x_0))
-    len_unequal = cons_unequal.shape[0]
-    cons_unequal_num = sp.lambdify(args, cons_unequal, modules='numpy')
     consv_unequal = cons_unequal_num(*x_0)
     # consv_unequal = np.array(cons_unequal.subs(reps)).astype(DataType)
-    if cons_equal is not None:
-        cons_equal_num = sp.lambdify(args, cons_equal, modules='numpy')
+    if cons_equal_num is not None:
         consv_equal = cons_equal_num(*x_0)
         # consv_equal = np.array(cons_equal.subs(reps)).astype(DataType)
         sub += (consv_equal.T).dot(consv_equal)
-        for i in range(len_unequal):
+        for i in range(len_cons):
             sub += (max(consv_unequal[i], - muk[i] / sigma))**2
     else:
-        for i in range(len_unequal):
+        for i in range(len_cons):
             sub += (max(consv_unequal[i], - muk[i] / sigma))**2
     return np.sqrt(sub)
 
-def renew_mu_k(cons_unequal: SympyMutableDenseMatrix, 
-               args: SympyMutableDenseMatrix, 
+def renew_mu_k(cons_unequal_num,
+               len_cons: int, 
                muk: NDArray, 
                sigma: float, 
                x_0: IterPointType) -> NDArray:
     # reps = dict(zip(args, x_0))
-    len_unequal = cons_unequal.shape[0]
-    cons_unequal_num = sp.lambdify(args, cons_unequal, modules='numpy')
     consv_unequal = cons_unequal_num(*x_0)
-    for i in range(len_unequal):
+    for i in range(len_cons):
         muk[i] = max(muk[i] + sigma * consv_unequal[i], 0)
     return muk
 

{optimtool-2.9.0 → optimtool-2.9.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.9.0'
+__version__ = '2.9.1'

{optimtool-2.9.0 → optimtool-2.9.1}/optimtool/constrain/mixequal.py

@@ -208,6 +208,8 @@ def lagrange_augmentedm(funcs: FuncArray,
     lamk = np.array([lamk for _ in range(cons_equal.shape[0])]).reshape(cons_equal.shape[0], 1)
     muk = np.array([muk for _ in range(cons_unequal.shape[0])]).reshape(cons_unequal.shape[0], 1)
     cons_equal_num = sp.lambdify(args, cons_equal, modules='numpy')
+    len_cons_unequal = len(cons_unequal)
+    cons_unequal_num = sp.lambdify(args, cons_unequal, modules='numpy')
     while 1:
         f.append(get_value(funcs_num, x_0))
         if verbose:
@@ -218,7 +220,7 @@ def lagrange_augmentedm(funcs: FuncArray,
         L = sp.Matrix([funcs + (sigma / 2) * (cons_equal.T * cons_equal + cons_uneuqal_modifyed) + cons_equal.T * lamk])
         x_0, _ = search(L, args, tuple(x_0), draw=False, epsilon=epsilonk)
         k += 1
-        vkx = v_k(cons_equal, cons_unequal, args, muk, sigma, x_0)
+        vkx = v_k(cons_equal_num, cons_unequal_num, len_cons_unequal, muk, sigma, x_0)
         if vkx <= epsilonk:
             res = L.jacobian(args)
             res_num = sp.lambdify(args, res, modules='numpy')
@@ -230,7 +232,7 @@ def lagrange_augmentedm(funcs: FuncArray,
             else:
                 consv_equal = cons_equal_num(*x_0)
                 lamk += sigma * consv_equal
-                muk = renew_mu_k(cons_unequal, args, muk, sigma, x_0)
+                muk = renew_mu_k(cons_unequal_num, len_cons_unequal, muk, sigma, x_0)
                 etak /= sigma
                 epsilonk /= sigma**beta
         else:

{optimtool-2.9.0 → optimtool-2.9.1}/optimtool/constrain/unequal.py

@@ -135,6 +135,8 @@ def lagrange_augmentedu(funcs: FuncArray,
     funcs_num = sp.lambdify(args, funcs, modules='numpy')
     search, f = kernel(method), []
     muk = np.array([muk for _ in range(cons.shape[0])]).reshape(cons.shape[0], 1)
+    len_cons = len(cons)
+    cons_unequal_num = sp.lambdify(args, cons, modules='numpy')
     while 1:
         f.append(get_value(funcs_num, x_0))
         if verbose:
@@ -145,7 +147,7 @@ def lagrange_augmentedu(funcs: FuncArray,
         L = sp.Matrix([funcs + (sigma / 2) * cons_uneuqal_modifyed])
         x_0, _ = search(L, args, tuple(x_0), draw=False, epsilon=epsilonk)
         k += 1
-        vkx = v_k(None, cons, args, muk, sigma, x_0)
+        vkx = v_k(None, cons_unequal_num, len_cons, muk, sigma, x_0)
         if vkx <= epsilonk:
             res = L.jacobian(args)
             res_num = sp.lambdify(args, res, modules='numpy')
@@ -155,7 +157,7 @@ def lagrange_augmentedu(funcs: FuncArray,
                     print("{}\t{}\t{}".format(x_0, f[-1], k))
                 break
             else:
-                muk = renew_mu_k(cons, args, muk, sigma, x_0)
+                muk = renew_mu_k(cons_unequal_num, len_cons, muk, sigma, x_0)
                 etak /= sigma
                 epsilonk /= sigma**beta
         else:

{optimtool-2.9.0 → optimtool-2.9.1}/optimtool/unconstrain/gradient_descent.py

@@ -178,7 +178,7 @@ def barzilar_borwein(funcs: FuncArray,
             yk = res_num(*x_0) + dk
             alpha_up = delta.dot(delta.T)
             alpha_down = (delta.dot(yk.T))[0]
-            if alpha_down != 0:
+            if alpha_down > 0:
                 alpha = alpha_up / alpha_down
             k += 1
         else:

{optimtool-2.9.0 → optimtool-2.9.1}/optimtool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimtool
-Version: 2.9.0
+Version: 2.9.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
@@ -61,7 +61,7 @@ License-File: LICENSE
   author       = {Lin, Jing},
   title        = {optimtool: The fundamental package for scientific research in optimization.},
   year         = {2021},
-  version      = {2.8.3},
+  version      = {2.9.1},
   publisher    = {PyPI},
   organization = {linjing-lab},
   url          = {https://pypi.org/project/optimtool/},

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