From 56599881cc2065705d876a907a4e6eac4e065eed Mon Sep 17 00:00:00 2001 From: Simon Blanke Date: Sun, 31 Dec 2023 15:57:08 +0100 Subject: [PATCH] fix init input --- surfaces/mathematical_functions/drop_wave_function.py | 5 ++--- surfaces/mathematical_functions/gramacy_and_lee_function.py | 4 ++-- surfaces/mathematical_functions/griewank_function.py | 4 ++-- surfaces/mathematical_functions/langermann_function.py | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/surfaces/mathematical_functions/drop_wave_function.py b/surfaces/mathematical_functions/drop_wave_function.py index 3486820..259da6b 100644 --- a/surfaces/mathematical_functions/drop_wave_function.py +++ b/surfaces/mathematical_functions/drop_wave_function.py @@ -17,8 +17,8 @@ class DropWaveFunction(MathematicalFunction): formula = r"""f(x, y) = -\frac{1+\cos (12\sqrt{x^2+y^2})}{0.5 (x^2 + y^2) + 2}""" global_minimum = r"""f(0, 0)= -1""" - def __init__(self, *args, **kwargs): - super().__init__(args, **kwargs) + def __init__(self, metric="score", input_type="dictionary", sleep=0): + super().__init__(metric, input_type, sleep) self.n_dim = 2 def objective_function_dict(self, params): @@ -28,5 +28,4 @@ def objective_function_dict(self, params): loss = -(1 + np.cos(12 * np.sqrt(x**2 + y**2))) / ( 0.5 * (x**2 + y**2) + 2 ) - return self.return_metric(loss) diff --git a/surfaces/mathematical_functions/gramacy_and_lee_function.py b/surfaces/mathematical_functions/gramacy_and_lee_function.py index 9d6d871..263ef28 100644 --- a/surfaces/mathematical_functions/gramacy_and_lee_function.py +++ b/surfaces/mathematical_functions/gramacy_and_lee_function.py @@ -17,8 +17,8 @@ class GramacyAndLeeFunction(MathematicalFunction): formula = r"""f(x) = \frac{\sin(10\pi x)}{2x} + (x - 1)^4""" global_minimum = r"""-""" - def __init__(self, *args, **kwargs): - super().__init__(args, **kwargs) + def __init__(self, metric="score", input_type="dictionary", sleep=0): + super().__init__() self.n_dim = 1 def objective_function_dict(self, params): diff --git a/surfaces/mathematical_functions/griewank_function.py b/surfaces/mathematical_functions/griewank_function.py index 4399325..148b825 100644 --- a/surfaces/mathematical_functions/griewank_function.py +++ b/surfaces/mathematical_functions/griewank_function.py @@ -17,8 +17,8 @@ class GriewankFunction(MathematicalFunction): formula = r"""f(\vec x) = \sum^d_{i=1} \frac{x_i^2}{4000} - \prod_{i=1}^d\cos (\frac{x_i}{\sqrt i}) + 1""" global_minimum = r"""f(\vec x = 0) = 0""" - def __init__(self, *args, n_dim, **kwargs): - super().__init__(args, **kwargs) + def __init__(self, n_dim, metric="score", input_type="dictionary", sleep=0): + super().__init__() self.n_dim = n_dim def objective_function_dict(self, params): diff --git a/surfaces/mathematical_functions/langermann_function.py b/surfaces/mathematical_functions/langermann_function.py index 11a3802..f663429 100644 --- a/surfaces/mathematical_functions/langermann_function.py +++ b/surfaces/mathematical_functions/langermann_function.py @@ -21,8 +21,8 @@ class LangermannFunction(MathematicalFunction): m = 5 A = np.array([[3, 5, 2, 1, 7], [5, 2, 1, 4, 9]]) - def __init__(self, *args, **kwargs): - super().__init__(args, **kwargs) + def __init__(self, metric="score", input_type="dictionary", sleep=0): + super().__init__() self.n_dim = 2 def objective_function_dict(self, params):