From 5f8c52ee2274a9b08ddb76f4396b0e7f51e4df61 Mon Sep 17 00:00:00 2001 From: Martin van der Schelling <61459087+mpvanderschelling@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:25:17 +0200 Subject: [PATCH 1/4] Update VERSION to 1.5.2 --- VERSION | 2 +- docs/source/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 8e03717..a73b432 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.1 \ No newline at end of file +1.5.2 \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index 72770b9..c647cc7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -25,8 +25,8 @@ project = 'f3dasm_optimize' author = 'Martin van der Schelling' copyright = '2023, Martin van der Schelling' -version = '1.5.1' -release = '1.5.1' +version = '1.5.2' +release = '1.5.2' # -- General configuration ---------------------------------------------------- From 926d91f497483a2b81b523e9e41c6f8558d231be Mon Sep 17 00:00:00 2001 From: Martin van der Schelling <61459087+mpvanderschelling@users.noreply.github.com> Date: Tue, 23 Apr 2024 14:31:09 +0200 Subject: [PATCH 2/4] Update optuna version to 0.1.7 --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index 49f5f3d..c460543 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,5 +2,5 @@ tensorflow pygmo; platform_system == "Linux" nevergrad evosax -optuna +optuna==0.1.7 optax \ No newline at end of file From f293817f575f645299be7e0a5a8d15ac9a606950 Mon Sep 17 00:00:00 2001 From: Martin van der Schelling <61459087+mpvanderschelling@users.noreply.github.com> Date: Tue, 23 Apr 2024 14:31:43 +0200 Subject: [PATCH 3/4] Update dependencies in requirements_all.txt --- requirements_all.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index c460543..dbd7f82 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,5 +2,5 @@ tensorflow pygmo; platform_system == "Linux" nevergrad evosax -optuna==0.1.7 -optax \ No newline at end of file +optuna +optax==0.1.7 \ No newline at end of file From 8d187c1c256d107fffae567526ca5bf8c61a1870 Mon Sep 17 00:00:00 2001 From: Martin van der Schelling <61459087+mpvanderschelling@users.noreply.github.com> Date: Fri, 17 May 2024 15:50:21 +0200 Subject: [PATCH 4/4] Refactor continuous parameter access in _PygmoProblem --- src/f3dasm_optimize/_src/_protocol.py | 3 ++- src/f3dasm_optimize/_src/adapters/pygmo_implementations.py | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/f3dasm_optimize/_src/_protocol.py b/src/f3dasm_optimize/_src/_protocol.py index 02368e2..7a5667e 100644 --- a/src/f3dasm_optimize/_src/_protocol.py +++ b/src/f3dasm_optimize/_src/_protocol.py @@ -30,7 +30,8 @@ class Domain(Protocol): """Protocol class for the domain""" - def get_continuous_parameters(self): + @property + def continuous(self): ... diff --git a/src/f3dasm_optimize/_src/adapters/pygmo_implementations.py b/src/f3dasm_optimize/_src/adapters/pygmo_implementations.py index d7c426d..7447383 100644 --- a/src/f3dasm_optimize/_src/adapters/pygmo_implementations.py +++ b/src/f3dasm_optimize/_src/adapters/pygmo_implementations.py @@ -88,11 +88,9 @@ def get_bounds(self) -> Tuple[List[float], List[float]]: """ return ( [parameter.lower_bound - for parameter in self.domain.get_continuous_parameters( - ).values()], + for parameter in self.domain.continuous.space.values()], [parameter.upper_bound - for parameter in self.domain.get_continuous_parameters( - ).values()], + for parameter in self.domain.continuous.space.values()], )