dev: refactor problem structure

docs/source/api/problems/test_suit/cec2022.rst → docs/source/api/problems/classic/cec2022.rst

@@ -2,7 +2,7 @@
 CEC2022 Test Suit
 =================
 
-.. autoclass:: evox.problems.test_suit.CEC2022
+.. autoclass:: evox.problems.test_suit.CEC2022TestSuit
     :members:
 
 .. autoclass:: evox.problems.test_suit.F1_CEC2022

docs/source/api/problems/classic/dtlz.rst

@@ -1,9 +1,6 @@
-===========
-DTLZ Family
-===========
-
-.. autoclass:: evox.problems.classic.DTLZ
-    :members:
+==============
+DTLZ Test Suit
+==============
 
 .. autoclass:: evox.problems.classic.DTLZ1
     :members:

docs/source/api/problems/classic/index.rst

@@ -11,4 +11,5 @@ Numerical Benchmarks
     rastrigin
     rosenbrock
     sphere
-    zdt
+    zdt
+    cec2022

docs/source/api/problems/classic/zdt.rst

@@ -1,6 +1,6 @@
-===
-ZDT
-===
+=============
+ZDT Test Suit
+=============
 
 .. autoclass:: evox.problems.classic.ZDT1
     :members:

docs/source/api/problems/index.rst

@@ -7,7 +7,6 @@ Problems
 .. toctree::
     :maxdepth: 2
 
-    classic/index
+    numerical/index
     neuroevolution/index
-    rl/index
-    test_suit/index
+    rl/index

src/evox/problems/numerical/__init__.py

@@ -0,0 +1,22 @@
+from .ackley import Ackley
+from .rastrigin import Rastrigin
+from .sphere import Sphere
+from .zdt import ZDT1, ZDT2, ZDT3, ZDT4, ZDT6
+from .griewank import Griewank
+from .rosenbrock import Rosenbrock
+from .dtlz import DTLZ1, DTLZ2, DTLZ3, DTLZ4, DTLZ5, DTLZ6, DTLZ7
+from .cec2022_so import (
+    CEC2022TestSuit,
+    F1_CEC2022,
+    F2_CEC2022,
+    F3_CEC2022,
+    F4_CEC2022,
+    F5_CEC2022,
+    F6_CEC2022,
+    F7_CEC2022,
+    F8_CEC2022,
+    F9_CEC2022,
+    F10_CEC2022,
+    F11_CEC2022,
+    F12_CEC2022,
+)

src/evox/problems/test_suit/cec2022_so.py → src/evox/problems/numerical/cec2022_so.py

@@ -737,7 +737,7 @@ def evaluate(self, state, X):
         return F, state
 
 
-class CEC2022:
+class CEC2022TestSuit:
     """
     Instantiation format: problem_instance = CEC2022.create(1)
     i.e., problem_instance = F1_CEC2022()

src/evox/problems/classic/dtlz.py → src/evox/problems/numerical/dtlz.py

@@ -7,7 +7,7 @@
 
 
 @jit_class
-class DTLZ(Problem):
+class DTLZTestSuit(Problem):
     """DTLZ"""
 
     def __init__(self, d=None, m=None, ref_num=1000):
@@ -30,7 +30,7 @@ def pf(self, state: chex.PyTreeDef):
         return f, state
 
 
-class DTLZ1(DTLZ):
+class DTLZ1(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=100):
         if m is None:
             self.m = 3
@@ -66,7 +66,7 @@ def evaluate(self, state: chex.PyTreeDef, X: chex.Array):
         return f, state
 
 
-class DTLZ2(DTLZ):
+class DTLZ2(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         if m is None:
             self.m = 3
@@ -105,7 +105,7 @@ def pf(self, state: chex.PyTreeDef):
         return f, state
 
 
-class DTLZ3(DTLZ2):
+class DTLZ3(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         super().__init__(d, m, ref_num)
 
@@ -139,7 +139,7 @@ def evaluate(self, state: chex.PyTreeDef, X: chex.Array):
         return f, state
 
 
-class DTLZ4(DTLZ2):
+class DTLZ4(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         super().__init__(d, m, ref_num)
 
@@ -166,7 +166,7 @@ def evaluate(self, state: chex.PyTreeDef, X: chex.Array):
         return f, state
 
 
-class DTLZ5(DTLZ):
+class DTLZ5(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         if m is None:
             self.m = 3
@@ -227,7 +227,7 @@ def pf(self, state: chex.PyTreeDef):
         return f, state
 
 
-class DTLZ6(DTLZ):
+class DTLZ6(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         if m is None:
             self.m = 3
@@ -288,7 +288,7 @@ def pf(self, state: chex.PyTreeDef):
         return f, state
 
 
-class DTLZ7(DTLZ):
+class DTLZ7(DTLZTestSuit):
     def __init__(self, d=None, m=None, ref_num=1000):
         if m is None:
             self.m = 3

src/evox/problems/classic/zdt.py → src/evox/problems/numerical/zdt.py

@@ -12,7 +12,7 @@ def _generic_zdt(f1, g, h, x):
 
 
 @jit_class
-class ZDT(Problem):
+class ZDTTestSuit(Problem):
     def __init__(self, n, ref_num=100):
         self.n = n
         self._zdt = None
@@ -28,7 +28,7 @@ def pf(self, state: chex.PyTreeDef):
         return jnp.c_[x, 1 - jnp.sqrt(x)], state
 
 
-class ZDT1(ZDT):
+class ZDT1(ZDTTestSuit):
     def __init__(self, n):
         super().__init__(n)
         f1 = lambda x: x[0]
@@ -37,7 +37,7 @@ def __init__(self, n):
         self._zdt = partial(_generic_zdt, f1, g, h)
 
 
-class ZDT2(ZDT):
+class ZDT2(ZDTTestSuit):
     def __init__(self, n):
         super().__init__(n)
         f1 = lambda x: x[0]
@@ -50,7 +50,7 @@ def pf(self, state: chex.PyTreeDef):
         return jnp.c_[x, 1 - x**2], state
 
 
-class ZDT3(ZDT):
+class ZDT3(ZDTTestSuit):
     def __init__(self, n):
         super().__init__(n)
         f1 = lambda x: x[0]
@@ -68,7 +68,7 @@ def pf(self, state: chex.PyTreeDef):
         return pf, state
 
 
-class ZDT4(ZDT):
+class ZDT4(ZDTTestSuit):
     def __init__(self, n):
         super().__init__(n)
         f1 = lambda x: x[0]
@@ -81,7 +81,7 @@ def __init__(self, n):
         self._zdt = partial(_generic_zdt, f1, g, h)
 
 
-class ZDT6(ZDT):
+class ZDT6(ZDTTestSuit):
     def __init__(self, n):
         super().__init__(n)
         f1 = lambda x: 1 - jnp.exp(-4 * x[0]) * jnp.sin(6 * jnp.pi * x[0])**6