UQPyL 2.0.2__tar.gz → 2.0.4__tar.gz

{UQPyL-2.0.2 → UQPyL-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UQPyL
-Version: 2.0.2
+Version: 2.0.4
 Summary: A python package for parameter uncertainty quantification and optimization
 Author: wmtSky
 Author-email: wmtSky <wmtsky@hhu.edu.cn>

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL/__init__.py

@@ -1,6 +1,6 @@
 from . import problems, surrogates, optimization, sensibility, DoE, utility
 
-__version__ = "2.0.1"
+__version__ = "2.0.4"
 __author__ = "wmtSky"
 
 __all__=[

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL/optimization/asmo.py

@@ -3,6 +3,7 @@ from tqdm import tqdm
 from typing import Optional
 
 from .sce_ua import SCE_UA
+from .pso import PSO
 from ..DoE import LHS
 from ..problems import Problem
 from ..surrogates import Surrogate
@@ -46,11 +47,11 @@ class ASMO():
         #construct optimization problem to combine surrogate and algorithm
         self.subProblem=Problem(self.surrogate.predict, self.n_input, 1, self.ub, self.lb)
         
-    def run(self,maxFE=1000, Tolerate=0.001, maxTolerateTime=50, oneStep=False):
+    def run(self, oneStep=False):
         '''
         main procedure
         ''' 
-        show_process=tqdm(total=maxFE)
+        show_process=tqdm(total=self.maxFE)
         FE=0
         TT=0
         n_input=self.n_input
@@ -65,22 +66,24 @@ class ASMO():
         XPop=self.x_init
         YPop=self.y_init
         
-        fe=YPop.shape[0]
-        show_process.update(fe)
+        FE=YPop.shape[0]
+        show_process.update(FE)
         ###
         idx=np.argsort(YPop, axis=0)
         BestY=YPop[idx[0,0],0]
         BestX=XPop[idx[0,0],:]
+        history_best_decs={}
+        history_best_objs={}
         # history_BestY=[]; history_BestX=[]
         # history_BestX.append(BestX)
         # history_BestY.append(BestY)
         
         if (oneStep==False):
-            while fe<self.maxFE and TT<self.maxTolerateTime:
+            while FE<self.maxFE and TT<self.maxTolerateTime:
                 show_process.update(1)
                 # Build surrogate model
                 self.surrogate.fit(XPop, YPop)
-                res=SCE_UA(self.subProblem).run()
+                res=PSO(self.subProblem).run()
                 BestX_SM=res['best_dec']
                 
                 TempY=self.evaluate(BestX_SM)
@@ -89,24 +92,28 @@ class ASMO():
                 YPop=np.vstack((YPop,TempY))
                 
                 if TempY[0,0]<BestY:
-                    BestY=np.copy(TempY)
+                    BestY=np.copy(TempY[0,0])
                     BestX=np.copy(BestX_SM)
+                    history_best_decs[FE]=BestX
+                    history_best_objs[FE]=BestY
         else:
             self.surrogate.fit(XPop, YPop)
             res=SCE_UA(self.subProblem).run()
-            BestX_SM=res['best_decs']
+            BestX_SM=res['best_dec']
             
             TempY=self.evaluate(BestX_SM)
             
-            fe+=1
+            FE+=1
             XPop=np.vstack((XPop,BestX_SM))
             YPop=np.vstack((YPop,TempY))
             
             if TempY[0,0]<BestY:
                 BestY=np.copy(TempY)
                 BestX=np.copy(BestX_SM)
+                history_best_decs[FE]=BestX
+                history_best_objs[FE]=BestY
         
-        Result={'best_dec':BestX, 'best_obj':BestY, 'FE':fe}
+        Result={'best_dec':BestX, 'best_obj':BestY, 'history_best_decs': history_best_decs, 'history_best_objs':history_best_objs ,'FE':FE}
         
         return Result
             

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL/optimization/mo_asmo.py

@@ -101,8 +101,8 @@ class MOASMO():
             nsga_ii=NSGAII(self.subProblem, self.n_pop)
             #main optimization
             Result=nsga_ii.run()
-            BestX=Result['pareto_X']
-            BestY=Result['pareto_Y']
+            BestX=Result['pareto_x']
+            BestY=Result['pareto_y']
             CrowdDis=Result['crowdDis']
             
             if self.advance_infilling==False:

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL/problems/problem_ABC.py

@@ -48,6 +48,7 @@ class ProblemABC(metaclass=abc.ABCMeta):
     
     def _check_bound(self,bound: np.ndarray):
         
-        if(not bound.shape[1]==self.n_input):
+        bound=bound.ravel()
+        if(not bound.shape[0]==self.n_input):
             raise ValueError('the input bound is inconsistent with the input n_inputensions')
         

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL/surrogates/gp_kernels/base_kernel.py

@@ -3,9 +3,9 @@ from typing import Union
 
 class Gp_Kernel():
     def __init__(self):
-        self._theta=None
-        self._theta_ub=None
-        self._theta_lb=None
+        self._theta={}
+        self._theta_ub={}
+        self._theta_lb={}
     
     def __check_array__(self, value: Union[float,np.ndarray]):
         

{UQPyL-2.0.2 → UQPyL-2.0.4}/UQPyL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UQPyL
-Version: 2.0.2
+Version: 2.0.4
 Summary: A python package for parameter uncertainty quantification and optimization
 Author: wmtSky
 Author-email: wmtSky <wmtsky@hhu.edu.cn>

{UQPyL-2.0.2 → UQPyL-2.0.4}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "UQPyL"
-version = "2.0.2"
+version = "2.0.4"
 authors = [
     {name = "wmtSky", email = "wmtsky@hhu.edu.cn"}
 ]

{UQPyL-2.0.2 → UQPyL-2.0.4}/setup.py

@@ -41,7 +41,7 @@ extensions=cythonize(cython_extensions, compiler_directives={'cdivision': True,
 setup(
     name="UQPyL",
     author="wmtSky",
-    version="2.0.2",
+    version="2.0.4",
     author_email="wmtsky@hhu.edu.cn",
     # ... 其他常规setup参数 ...
     ext_modules=extensions,  # 如果有自定义的编译行为