diff --git a/UQPyL/__init__.py b/UQPyL/__init__.py index 649681fc..1c43282e 100644 --- a/UQPyL/__init__.py +++ b/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__=[ diff --git a/UQPyL/optimization/asmo.py b/UQPyL/optimization/asmo.py index 6720889e..78906d38 100644 --- a/UQPyL/optimization/asmo.py +++ b/UQPyL/optimization/asmo.py @@ -3,6 +3,7 @@ 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 @@ def __init__(self, problem: Problem, surrogate: Surrogate, #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,8 +66,8 @@ def run(self,maxFE=1000, Tolerate=0.001, maxTolerateTime=50, oneStep=False): 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] @@ -78,11 +79,11 @@ def run(self,maxFE=1000, Tolerate=0.001, maxTolerateTime=50, oneStep=False): # history_BestY.append(BestY) if (oneStep==False): - while fe