Skip to content

Commit

Permalink
Updates documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian Blank committed Mar 10, 2021
1 parent 876c86c commit f0e3f45
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
sudo apt-get install pandoc rsync
python -m pip install --upgrade pip
pip install -r doc/requirements.txt
pip install numpy matplotlib autograd
pip install numpy matplotlib autograd scipy
- name: Create Documentation
run: |
cd doc
Expand Down
4 changes: 0 additions & 4 deletions pymoo/algorithms/moo/moead.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from pymoo.operators.mutation.polynomial_mutation import PolynomialMutation
from pymoo.operators.sampling.random_sampling import FloatRandomSampling
from pymoo.util.display import MultiObjectiveDisplay
from pymoo.util.misc import parameter_less


# =========================================================================================================
Expand Down Expand Up @@ -59,9 +58,6 @@ def __init__(self,
display=MultiObjectiveDisplay(),
**kwargs):
"""
MOEAD Algorithm.
Parameters
----------
ref_dirs
Expand Down
2 changes: 2 additions & 0 deletions pymoo/algorithms/moo/nsga2.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,5 @@ def calc_crowding_distance(F, filter_out_duplicates=True):


parse_doc_string(NSGA2.__init__)

print("sdfs")
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
from pymoo.model.individual import Individual
from pymoo.model.population import Population
from pymoo.model.replacement import is_better
from pymoo.model.termination import Termination
from pymoo.operators.repair.to_bound import set_to_bounds_if_outside_by_problem
from pymoo.util.display import SingleObjectiveDisplay
from pymoo.util.optimum import filter_optimum
from pymoo.util.termination.default import SingleObjectiveDefaultTermination


# =========================================================================================================
Expand Down
6 changes: 3 additions & 3 deletions pymoo/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ def get_algorithm_options():
from pymoo.algorithms.soo.nonconvex.de import DE
from pymoo.algorithms.soo.nonconvex.ga import GA
from pymoo.algorithms.moo.unsga3 import UNSGA3
from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import NelderMead
from pymoo.algorithms.soo.convex.nonderiv.cmaes import CMAES
from pymoo.algorithms.soo.nonconvex.nelder_mead import NelderMead
from pymoo.algorithms.soo.nonconvex.cmaes import CMAES
from pymoo.algorithms.soo.nonconvex.brkga import BRKGA
from pymoo.algorithms.soo.convex.nonderiv.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.pattern_search import PatternSearch

ALGORITHMS = [
("ga", GA),
Expand Down
2 changes: 1 addition & 1 deletion pymoo/operators/crossover/nelder_mead_crossover.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np

from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import max_alpha
from pymoo.algorithms.soo.nonconvex.nelder_mead import max_alpha
from pymoo.model.crossover import Crossover


Expand Down
2 changes: 1 addition & 1 deletion pymoo/usage/algorithms/usage_ask_and_tell.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pymoo.algorithms.soo.convex.nonderiv.cmaes import CMAES
from pymoo.algorithms.soo.nonconvex.cmaes import CMAES
from pymoo.factory import Problem
from pymoo.model.evaluator import Evaluator, set_cv

Expand Down
6 changes: 3 additions & 3 deletions pymoo/usage/algorithms/usage_cmaes.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np

from pymoo.algorithms.soo.convex.nonderiv.cmaes import CMAES
from pymoo.factory import Sphere
from pymoo.algorithms.soo.nonconvex.cmaes import CMAES
from pymoo.factory import get_problem
from pymoo.optimize import minimize

problem = Sphere()
problem = get_problem("sphere")

algorithm = CMAES(x0=np.random.random(problem.n_var))

Expand Down
1 change: 1 addition & 0 deletions pymoo/usage/algorithms/usage_moead.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
decomposition="pbi",
prob_neighbor_mating=0.7,
seed=1,
verbose=False
)

res = minimize(problem, algorithm, termination=('n_gen', 200), verbose=True)
Expand Down
2 changes: 1 addition & 1 deletion pymoo/usage/algorithms/usage_nelder_mead.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import NelderMead
from pymoo.algorithms.soo.nonconvex.nelder_mead import NelderMead
from pymoo.factory import get_problem
from pymoo.optimize import minimize

Expand Down
2 changes: 1 addition & 1 deletion pymoo/usage/algorithms/usage_pattern_search.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pymoo.algorithms.soo.convex.nonderiv.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.pattern_search import PatternSearch
from pymoo.factory import Himmelblau
from pymoo.optimize import minimize

Expand Down
2 changes: 1 addition & 1 deletion tests/algorithms/test_nelder_mead.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
from scipy.optimize import minimize as scipy_minimize

from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import NelderMead
from pymoo.algorithms.soo.nonconvex.nelder_mead import NelderMead
from pymoo.factory import get_problem, get_termination
from pymoo.optimize import minimize

Expand Down
9 changes: 4 additions & 5 deletions tests/algorithms/test_no_error.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import pytest

from pymoo.algorithms.moo.gde3 import GDE3
from pymoo.algorithms.moo.moead import MOEAD, ParallelMOEAD
from pymoo.algorithms.moo.nsga2 import NSGA2
from pymoo.algorithms.moo.rvea import RVEA
from pymoo.algorithms.soo.convex.nonderiv.cmaes import CMAES
from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import NelderMead
from pymoo.algorithms.soo.convex.nonderiv.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.cmaes import CMAES
from pymoo.algorithms.soo.nonconvex.nelder_mead import NelderMead
from pymoo.algorithms.soo.nonconvex.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.de import DE
from pymoo.algorithms.soo.nonconvex.direct import DIRECT
from pymoo.algorithms.soo.nonconvex.pso import PSO
from pymoo.factory import Sphere, Rosenbrock, Himmelblau, ZDT1, ZDT2, ZDT3, get_reference_directions
from pymoo.factory import Sphere, Rosenbrock, Himmelblau, ZDT1, get_reference_directions
from pymoo.optimize import minimize
import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion tests/algorithms/test_pattern_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import pytest

from pymoo.algorithms.soo.convex.nonderiv.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.pattern_search import PatternSearch
from pymoo.operators.sampling.random_sampling import FloatRandomSampling
from pymoo.optimize import minimize
from pymoo.problems.single import Sphere, Himmelblau
Expand Down
4 changes: 2 additions & 2 deletions tests/algorithms/test_single_objective.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from pymoo.algorithms.soo.convex.nonderiv.nelder_mead import NelderMead
from pymoo.algorithms.soo.convex.nonderiv.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.nelder_mead import NelderMead
from pymoo.algorithms.soo.nonconvex.pattern_search import PatternSearch
from pymoo.algorithms.soo.nonconvex.ga import GA
from pymoo.algorithms.soo.nonconvex.pso import PSO
from pymoo.factory import Sphere, Problem
Expand Down

0 comments on commit f0e3f45

Please sign in to comment.