move files into new structure

SimonBlanke · Apr 13, 2024 · e923d2e · e923d2e
1 parent f0eb2ec
commit e923d2e
Show file tree

Hide file tree

Showing 44 changed files with 189 additions and 3 deletions.
diff --git a/src/surfaces/__init__.py b/src/surfaces/__init__.py
@@ -7,14 +7,14 @@
 __version__ = importlib.metadata.version("surfaces")
 __license__ = "MIT"
 
-from .mathematical_functions import (
+from .test_functions import (
     mathematical_functions,
     mathematical_functions_1d,
     mathematical_functions_2d,
     mathematical_functions_nd,
+    machine_learning_functions,
 )
 
-from .machine_learning_functions import machine_learning_functions
 
 test_functions: list = mathematical_functions + machine_learning_functions
 

diff --git a/src/surfaces/search_data.db b/src/surfaces/search_data.db
diff --git a/src/surfaces/test_functions/__init__.py b/src/surfaces/test_functions/__init__.py
@@ -0,0 +1,135 @@
+# Author: Simon Blanke
+# Email: [email protected]
+# License: MIT License
+
+from .mathematical import (
+    AckleyFunction,
+    BealeFunction,
+    BoothFunction,
+    BukinFunctionN6,
+    CrossInTrayFunction,
+    DropWaveFunction,
+    EasomFunction,
+    EggholderFunction,
+    GoldsteinPriceFunction,
+    GramacyAndLeeFunction,
+    GriewankFunction,
+    HimmelblausFunction,
+    HölderTableFunction,
+    LangermannFunction,
+    LeviFunctionN13,
+    MatyasFunction,
+    McCormickFunction,
+    RastriginFunction,
+    RosenbrockFunction,
+    SchafferFunctionN2,
+    SimionescuFunction,
+    SphereFunction,
+    StyblinskiTangFunction,
+    ThreeHumpCamelFunction,
+)
+from .machine_learning import (
+    KNeighborsClassifierFunction,
+    GradientBoostingRegressorFunction,
+    KNeighborsRegressorFunction,
+)
+
+
+__all__ = [
+    "AckleyFunction",
+    "BealeFunction",
+    "BoothFunction",
+    "BukinFunctionN6",
+    "CrossInTrayFunction",
+    "DropWaveFunction",
+    "EasomFunction",
+    "EggholderFunction",
+    "GoldsteinPriceFunction",
+    "GramacyAndLeeFunction",
+    "GriewankFunction",
+    "HimmelblausFunction",
+    "HölderTableFunction",
+    "LangermannFunction",
+    "LeviFunctionN13",
+    "MatyasFunction",
+    "McCormickFunction",
+    "RastriginFunction",
+    "RosenbrockFunction",
+    "SchafferFunctionN2",
+    "SimionescuFunction",
+    "SphereFunction",
+    "StyblinskiTangFunction",
+    "ThreeHumpCamelFunction",
+    "KNeighborsClassifierFunction",
+    "GradientBoostingRegressorFunction",
+    "KNeighborsRegressorFunction",
+]
+
+mathematical_functions = [
+    AckleyFunction,
+    BealeFunction,
+    BoothFunction,
+    BukinFunctionN6,
+    CrossInTrayFunction,
+    DropWaveFunction,
+    EasomFunction,
+    EggholderFunction,
+    GoldsteinPriceFunction,
+    GramacyAndLeeFunction,
+    GriewankFunction,
+    HimmelblausFunction,
+    HölderTableFunction,
+    LangermannFunction,
+    LeviFunctionN13,
+    MatyasFunction,
+    McCormickFunction,
+    RastriginFunction,
+    RosenbrockFunction,
+    SchafferFunctionN2,
+    SimionescuFunction,
+    SphereFunction,
+    StyblinskiTangFunction,
+    ThreeHumpCamelFunction,
+]
+
+
+mathematical_functions_1d = [
+    GramacyAndLeeFunction,
+]
+
+
+mathematical_functions_2d = [
+    AckleyFunction,
+    BealeFunction,
+    BoothFunction,
+    BukinFunctionN6,
+    CrossInTrayFunction,
+    DropWaveFunction,
+    EasomFunction,
+    EggholderFunction,
+    GoldsteinPriceFunction,
+    HimmelblausFunction,
+    HölderTableFunction,
+    LangermannFunction,
+    LeviFunctionN13,
+    MatyasFunction,
+    McCormickFunction,
+    RosenbrockFunction,
+    SchafferFunctionN2,
+    SimionescuFunction,
+    ThreeHumpCamelFunction,
+]
+
+
+mathematical_functions_nd = [
+    GriewankFunction,
+    RastriginFunction,
+    SphereFunction,
+    StyblinskiTangFunction,
+]
+
+machine_learning_functions = [
+    KNeighborsClassifierFunction,
+    GradientBoostingRegressorFunction,
+    KNeighborsRegressorFunction,
+]
diff --git a/src/surfaces/_base_test_function.py → ...ces/test_functions/_base_test_function.py b/src/surfaces/_base_test_function.py → ...ces/test_functions/_base_test_function.py
@@ -4,7 +4,7 @@
 
 import time
 
-from .data_collector import SurfacesDataCollector
+from ..data_collector import SurfacesDataCollector
 
 
 class BaseTestFunction:

diff --git a/...es/machine_learning_functions/__init__.py → ...st_functions/machine_learning/__init__.py b/...es/machine_learning_functions/__init__.py → ...st_functions/machine_learning/__init__.py
diff --git a/...nctions/base_machine_learning_function.py → ...earning/base_machine_learning_function.py b/...nctions/base_machine_learning_function.py → ...earning/base_machine_learning_function.py
diff --git a/...e_learning_functions/datasets/__init__.py → ...ons/machine_learning/datasets/__init__.py b/...e_learning_functions/datasets/__init__.py → ...ons/machine_learning/datasets/__init__.py
diff --git a/...ctions/datasets/tabular_classification.py → ...arning/datasets/tabular_classification.py b/...ctions/datasets/tabular_classification.py → ...arning/datasets/tabular_classification.py
diff --git a/..._functions/datasets/tabular_regression.py → ...e_learning/datasets/tabular_regression.py b/..._functions/datasets/tabular_regression.py → ...e_learning/datasets/tabular_regression.py
diff --git a/src/surfaces/test_functions/machine_learning/tabular/__init__.py b/src/surfaces/test_functions/machine_learning/tabular/__init__.py
diff --git a/src/surfaces/test_functions/machine_learning/tabular/classification/__init__.py b/src/surfaces/test_functions/machine_learning/tabular/classification/__init__.py
diff --git a/src/surfaces/test_functions/machine_learning/tabular/regression/__init__.py b/src/surfaces/test_functions/machine_learning/tabular/regression/__init__.py
diff --git a/...learning_functions/tabular_classifiers.py → ...s/machine_learning/tabular_classifiers.py b/...learning_functions/tabular_classifiers.py → ...s/machine_learning/tabular_classifiers.py
diff --git a/..._learning_functions/tabular_regressors.py → ...ns/machine_learning/tabular_regressors.py b/..._learning_functions/tabular_regressors.py → ...ns/machine_learning/tabular_regressors.py
diff --git a/...rfaces/mathematical_functions/__init__.py → ...s/test_functions/mathematical/__init__.py b/...rfaces/mathematical_functions/__init__.py → ...s/test_functions/mathematical/__init__.py
diff --git a/...cal_functions/_base_objective_function.py → .../mathematical/_base_objective_function.py b/...cal_functions/_base_objective_function.py → .../mathematical/_base_objective_function.py
diff --git a/...l_functions/test_functions_1d/__init__.py → ...athematical/test_functions_1d/__init__.py b/...l_functions/test_functions_1d/__init__.py → ...athematical/test_functions_1d/__init__.py
diff --git a/..._functions_1d/gramacy_and_lee_function.py → ..._functions_1d/gramacy_and_lee_function.py b/..._functions_1d/gramacy_and_lee_function.py → ..._functions_1d/gramacy_and_lee_function.py
diff --git a/...l_functions/test_functions_2d/__init__.py → ...athematical/test_functions_2d/__init__.py b/...l_functions/test_functions_2d/__init__.py → ...athematical/test_functions_2d/__init__.py
diff --git a/...ions/test_functions_2d/ackley_function.py → ...ical/test_functions_2d/ackley_function.py b/...ions/test_functions_2d/ackley_function.py → ...ical/test_functions_2d/ackley_function.py
diff --git a/...tions/test_functions_2d/beale_function.py → ...tical/test_functions_2d/beale_function.py b/...tions/test_functions_2d/beale_function.py → ...tical/test_functions_2d/beale_function.py
diff --git a/...tions/test_functions_2d/booth_function.py → ...tical/test_functions_2d/booth_function.py b/...tions/test_functions_2d/booth_function.py → ...tical/test_functions_2d/booth_function.py
diff --git a/...ns/test_functions_2d/bukin_function_n6.py → ...al/test_functions_2d/bukin_function_n6.py b/...ns/test_functions_2d/bukin_function_n6.py → ...al/test_functions_2d/bukin_function_n6.py
diff --git a/...st_functions_2d/cross_in_tray_function.py → ...st_functions_2d/cross_in_tray_function.py b/...st_functions_2d/cross_in_tray_function.py → ...st_functions_2d/cross_in_tray_function.py
diff --git a/...s/test_functions_2d/drop_wave_function.py → ...l/test_functions_2d/drop_wave_function.py b/...s/test_functions_2d/drop_wave_function.py → ...l/test_functions_2d/drop_wave_function.py
diff --git a/...tions/test_functions_2d/easom_function.py → ...tical/test_functions_2d/easom_function.py b/...tions/test_functions_2d/easom_function.py → ...tical/test_functions_2d/easom_function.py
diff --git a/...s/test_functions_2d/eggholder_function.py → ...l/test_functions_2d/eggholder_function.py b/...s/test_functions_2d/eggholder_function.py → ...l/test_functions_2d/eggholder_function.py
diff --git a/..._functions_2d/goldstein_price_function.py → ..._functions_2d/goldstein_price_function.py b/..._functions_2d/goldstein_price_function.py → ..._functions_2d/goldstein_price_function.py
diff --git a/...test_functions_2d/himmelblaus_function.py → ...test_functions_2d/himmelblaus_function.py b/...test_functions_2d/himmelblaus_function.py → ...test_functions_2d/himmelblaus_function.py
diff --git a/...st_functions_2d/hoelder_table_function.py → ...st_functions_2d/hoelder_table_function.py b/...st_functions_2d/hoelder_table_function.py → ...st_functions_2d/hoelder_table_function.py
diff --git a/.../test_functions_2d/langermann_function.py → .../test_functions_2d/langermann_function.py b/.../test_functions_2d/langermann_function.py → .../test_functions_2d/langermann_function.py
diff --git a/...ns/test_functions_2d/levi_function_n13.py → ...al/test_functions_2d/levi_function_n13.py b/...ns/test_functions_2d/levi_function_n13.py → ...al/test_functions_2d/levi_function_n13.py
diff --git a/...ions/test_functions_2d/matyas_function.py → ...ical/test_functions_2d/matyas_function.py b/...ions/test_functions_2d/matyas_function.py → ...ical/test_functions_2d/matyas_function.py
diff --git a/...s/test_functions_2d/mccormick_function.py → ...l/test_functions_2d/mccormick_function.py b/...s/test_functions_2d/mccormick_function.py → ...l/test_functions_2d/mccormick_function.py
diff --git a/...test_functions_2d/schaffer_function_n2.py → ...test_functions_2d/schaffer_function_n2.py b/...test_functions_2d/schaffer_function_n2.py → ...test_functions_2d/schaffer_function_n2.py
diff --git a/.../test_functions_2d/simionescu_function.py → .../test_functions_2d/simionescu_function.py b/.../test_functions_2d/simionescu_function.py → .../test_functions_2d/simionescu_function.py
diff --git a/...functions_2d/three_hump_camel_function.py → ...functions_2d/three_hump_camel_function.py b/...functions_2d/three_hump_camel_function.py → ...functions_2d/three_hump_camel_function.py
diff --git a/...l_functions/test_functions_nd/__init__.py → ...athematical/test_functions_nd/__init__.py b/...l_functions/test_functions_nd/__init__.py → ...athematical/test_functions_nd/__init__.py
diff --git a/...ns/test_functions_nd/griewank_function.py → ...al/test_functions_nd/griewank_function.py b/...ns/test_functions_nd/griewank_function.py → ...al/test_functions_nd/griewank_function.py
diff --git a/...s/test_functions_nd/rastrigin_function.py → ...l/test_functions_nd/rastrigin_function.py b/...s/test_functions_nd/rastrigin_function.py → ...l/test_functions_nd/rastrigin_function.py
diff --git a/.../test_functions_nd/rosenbrock_function.py → .../test_functions_nd/rosenbrock_function.py b/.../test_functions_nd/rosenbrock_function.py → .../test_functions_nd/rosenbrock_function.py
diff --git a/...ions/test_functions_nd/sphere_function.py → ...ical/test_functions_nd/sphere_function.py b/...ions/test_functions_nd/sphere_function.py → ...ical/test_functions_nd/sphere_function.py
diff --git a/..._functions_nd/styblinski_tang_function.py → ..._functions_nd/styblinski_tang_function.py b/..._functions_nd/styblinski_tang_function.py → ..._functions_nd/styblinski_tang_function.py
diff --git a/src/surfaces/test_functions/mathematical/test_search_space.py b/src/surfaces/test_functions/mathematical/test_search_space.py
@@ -0,0 +1,51 @@
+import pytest
+
+from surfaces import (
+    mathematical_functions_1d,
+    mathematical_functions_2d,
+    mathematical_functions_nd,
+    machine_learning_functions,
+)
+
+
+mathematical_functions_1d = (
+    "test_function",
+    mathematical_functions_1d,
+)
+
+mathematical_functions_2d = (
+    "test_function",
+    mathematical_functions_1d,
+)
+
+mathematical_functions_nd = (
+    "test_function",
+    mathematical_functions_1d,
+)
+
+
+machine_learning_functions_d = (
+    "test_function",
+    machine_learning_functions,
+)
+
+
+@pytest.mark.parametrize(*mathematical_functions_d)
+def test_(test_function):
+    try:
+        test_function_ = test_function()
+    except TypeError:
+        test_function_ = test_function(n_dim=2)
+
+    objective_function = test_function_.objective_function
+    search_space = test_function_.search_space(value_types="array")
+    n_iter = 20
+
+
+@pytest.mark.parametrize(*machine_learning_functions_d)
+def test_all_(test_function):
+    test_function_ = test_function()
+
+    objective_function = test_function_.objective_function
+    search_space = test_function_.search_space()
+    n_iter = 20