Skip to content

Commit

Permalink
update to pymoo 0.5.0
Browse files Browse the repository at this point in the history
bumped version number
changed pymoo requirements for package
  • Loading branch information
Immudzen committed Dec 7, 2021
1 parent daa8e74 commit 86a1033
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
3 changes: 1 addition & 2 deletions CADETMatch.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
<LaunchProvider>Standard Python launcher</LaunchProvider>
<InterpreterId>CondaEnv|CondaEnv|cadet_devel</InterpreterId>
<CommandLineArguments>"F:\MCMC\Synthetic\SMAMultiple_Mult\release_5\SMA_MCMC_pump_delay_1000\MCMC_SMA_pump.json" 1</CommandLineArguments>
<CommandLineArguments>"F:\cadet_release_test\search\unsga3\dextran.json" 12</CommandLineArguments>
<EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
<SuppressConfigureTestFrameworkPrompt>true</SuppressConfigureTestFrameworkPrompt>
<InterpreterArguments>
Expand Down Expand Up @@ -80,7 +80,6 @@
<Compile Include="CADETMatch\match.py" />
<Compile Include="CADETMatch\mcmc_plot_tube.py" />
<Compile Include="CADETMatch\mle.py" />
<Compile Include="CADETMatch\modEnsemble.py" />
<Compile Include="CADETMatch\obsolete\obsolete_score.py" />
<Compile Include="CADETMatch\obsolete\scores\breakthrough.py" />
<Compile Include="CADETMatch\obsolete\scores\breakthroughCross.py" />
Expand Down
8 changes: 2 additions & 6 deletions CADETMatch/pymoo_config.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
import copy
import csv
import multiprocessing
import time
import numpy
import random
import pickle
from pathlib import Path

import CADETMatch.jacobian as jacobian
import CADETMatch.pareto as pareto
import CADETMatch.progress as progress
import CADETMatch.sub as sub
import CADETMatch.util as util
import CADETMatch.pop as pop

from pymoo.factory import get_algorithm, get_reference_directions
from pymoo.optimize import minimize
from pymoo.model.problem import Problem
from pymoo.core.problem import Problem
import attr


Expand All @@ -36,7 +32,7 @@ class ProblemState:
class MyProblem(Problem):

def __init__(self, n_var, n_obj, lb, ub, evaluate_function, problem_state):
super().__init__(n_var=n_var, n_obj=n_obj, n_constr=0, xl=lb, xu=ub, elementwise_evaluation=False)
super().__init__(n_var=n_var, n_obj=n_obj, n_constr=0, xl=lb, xu=ub)
self.evaluate_function = evaluate_function
self.problem_state = problem_state

Expand Down
10 changes: 5 additions & 5 deletions CADETMatch/smoothing.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

import CADETMatch.util as util

from pymoo.model.problem import Problem
from pymoo.core.problem import ElementwiseProblem
from pymoo.factory import get_algorithm, get_reference_directions
from pymoo.optimize import minimize

butter_order = 3

class TargetProblem(Problem):
class TargetProblem(ElementwiseProblem):

def __init__(self, lb, ub, sse_target, func, values, fs):
super().__init__(n_var=1, n_obj=1, n_constr=0, xl=lb, xu=ub, elementwise_evaluation=True)
super().__init__(n_var=1, n_obj=1, n_constr=0, xl=lb, xu=ub)
self.sse_target = sse_target
self.func = func
self.values = values
Expand All @@ -36,10 +36,10 @@ def _evaluate(self, crit_fs, out, *args, **kwargs):
error = numpy.inf
out["F"] = error

class MaxDistance(Problem):
class MaxDistance(ElementwiseProblem):

def __init__(self, lb, ub, func, fs, values, x_min, y_min, p1, p2, factor):
super().__init__(n_var=1, n_obj=1, n_constr=0, xl=lb, xu=ub, elementwise_evaluation=True)
super().__init__(n_var=1, n_obj=1, n_constr=0, xl=lb, xu=ub)
self.func = func
self.fs = fs
self.values = values
Expand Down
2 changes: 1 addition & 1 deletion CADETMatch/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
__email__ = "[email protected]"
__license__ = "GNU General Public License v3 (GPLv3)"
__copyright__ = "2020 %s" % __author__
__version__ = "0.8.13"
__version__ = "0.8.14"
__uri__ = "https://github.com/modsim/CADET-Match"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'emcee>=3.0.2',
'SAlib',
'corner>=2.1.0',
'pymoo==0.4.2.2',
'pymoo>=0.5.0',
'psutil>=5.7.0',
'openpyxl>=3.0.3',
'numpy>=1.18.5',
Expand Down

0 comments on commit 86a1033

Please sign in to comment.