Skip to content

Commit

Permalink
Maint: Hypervolume (pyhv.py) module rewrite (#484)
Browse files Browse the repository at this point in the history
  • Loading branch information
Corwinpro authored Feb 12, 2020
1 parent 70873e9 commit caf2059
Show file tree
Hide file tree
Showing 6 changed files with 621 additions and 464 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,3 @@ as well as pieces of advice on how to choose the proper optimizer for your probl
## License

`nevergrad` is released under the MIT license. See [LICENSE](LICENSE) for additional details about it.
LGPL code is however also included in the multiobjective subpackage.
165 changes: 0 additions & 165 deletions nevergrad/functions/multiobjective/LGPL_LICENSE

This file was deleted.

5 changes: 2 additions & 3 deletions nevergrad/functions/multiobjective/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
from typing import Tuple, Any, Callable, List, Dict
import numpy as np
from nevergrad.common.typetools import ArrayLike
from .pyhv import _HyperVolume

from .hypervolume import HypervolumeIndicator

ArgsKwargs = Tuple[Tuple[Any, ...], Dict[str, Any]]

Expand Down Expand Up @@ -37,7 +36,7 @@ class MultiobjectiveFunction:
def __init__(self, multiobjective_function: Callable[..., ArrayLike], upper_bounds: ArrayLike) -> None:
self.multiobjective_function = multiobjective_function
self._upper_bounds = np.array(upper_bounds, copy=False)
self._hypervolume: Any = _HyperVolume(self._upper_bounds) # type: ignore
self._hypervolume: Any = HypervolumeIndicator(self._upper_bounds) # type: ignore
self._points: List[Tuple[ArgsKwargs, np.ndarray]] = []
self._best_volume = -float("Inf")

Expand Down
Loading

0 comments on commit caf2059

Please sign in to comment.