Rename AdaptiveAEO to AugmentedAEO

thieu1995 · Jan 14, 2023 · af2a0fe · af2a0fe
1 parent ffe2aa8
commit af2a0fe
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/.github/PARALLEL.md b/.github/PARALLEL.md
@@ -140,7 +140,7 @@ D. Music
     1. HS (OrigianlHS and BaseHS)
 
 E. System
-    1. AEO (BaseAEO, ImprovedAEO, ModifiedAEO, AdaptiveAEO, EnhancedAEO)
+    1. AEO (BaseAEO, ImprovedAEO, ModifiedAEO, AugmentedAEO, EnhancedAEO)
         + Select random agents in population but strong algorithm in the end.
 
 F. Human

diff --git a/.github/models_history.xlsx b/.github/models_history.xlsx
diff --git a/README.md b/README.md
@@ -577,7 +577,7 @@ If you are using mealpy in your project, we would appreciate citations:
 | System       | -                                               | -          | EnhancedAEO      | 2020     | 2         | medium         |
 | System       | -                                               | -          | ModifiedAEO      | 2020     | 2         | medium         |
 | System       | -                                               | -          | ImprovedAEO      | 2021     | 2         | medium         |
-| System       | -                                               | -          | AdaptiveAEO      | -        | 2         | medium         |
+| System       | -                                               | -          | AugmentedAEO     | 2022     | 2         | medium         |
 | -            | -                                               | -          | -                | -        | -         | -              |
 | Math         | Hill Climbing                                   | HC         | OriginalHC       | 1993     | 3         | easy           |
 | Math         | -                                               | -          | SwarmHC          | -        | 3         | easy           |
@@ -613,7 +613,7 @@ If you are using mealpy in your project, we would appreciate citations:
 
 * **AEO - Artificial Ecosystem-based Optimization** 
   * **OriginalAEO**: Zhao, W., Wang, L., & Zhang, Z. (2019). Artificial ecosystem-based optimization: a novel nature-inspired meta-heuristic algorithm. Neural Computing and Applications, 1-43.
-  * **AdaptiveAEO**: The adaptive version
+  * **AugmentedAEO**: Van Thieu, N., Barma, S. D., Van Lam, T., Kisi, O., & Mahesha, A. (2022). Groundwater level modeling using Augmented Artificial Ecosystem Optimization. Journal of Hydrology, 129034.
   * **ImprovedAEO**: Rizk-Allah, R. M., & El-Fergany, A. A. (2020). Artificial ecosystem optimizer for parameters identification of proton exchange membrane fuel cells model. International Journal of Hydrogen Energy.
   * **EnhancedAEO**: Eid, A., Kamel, S., Korashy, A., & Khurshaid, T. (2020). An Enhanced Artificial Ecosystem-Based Optimization for Optimal Allocation of Multiple Distributed Generations. IEEE Access, 8, 178493-178513.
   * **ModifiedAEO**: Menesy, A. S., Sultan, H. M., Korashy, A., Banakhr, F. A., Ashmawy, M. G., & Kamel, S. (2020). Effective parameter extraction of different polymer electrolyte membrane fuel cell stack models using a modified artificial ecosystem optimization algorithm. IEEE Access, 8, 31892-31909.

diff --git a/docs/source/pages/general/advances/import_all_models.rst b/docs/source/pages/general/advances/import_all_models.rst
@@ -802,7 +802,7 @@ Import All Models
 		model = AEO.EnhancedAEO(**paras_aeo)
 		model = AEO.ModifiedAEO(**paras_aeo)
 		model = AEO.ImprovedAEO(**paras_aeo)
-		model = AEO.AdaptiveAEO(**paras_aeo)
+		model = AEO.AugmentedAEO(**paras_aeo)
 		model = GCO.BaseGCO(**paras_aeo)
 		model = GCO.OriginalGCO(**paras_aeo)
 		model = WCA.OriginalWCA(**paras_wca)

diff --git a/docs/source/pages/general/classification_table.rst b/docs/source/pages/general/classification_table.rst
@@ -186,7 +186,7 @@
 | System        | -                                                | -         | EnhancedAEO       | 2020  | 2      | medium      |
 | System        | -                                                | -         | ModifiedAEO       | 2020  | 2      | medium      |
 | System        | -                                                | -         | ImprovedAEO       | 2021  | 2      | medium      |
-| System        | -                                                | -         | AdaptiveAEO       | -     | 2      | medium      |
+| System        | -                                                | -         | AugmentedAEO      | 2022  | 2      | medium      |
 | -             | -                                                | -         | -                 | -     | -      | -           |
 | Math          | Hill Climbing                                    | HC        | OriginalHC        | 1993  | 3      | easy        |
 | Math          | -                                                | -         | SwarmHC           | -     | 3      | easy        |

diff --git a/docs/source/pages/general/references.rst b/docs/source/pages/general/references.rst
@@ -15,7 +15,7 @@ A.
 
 * **AEO - Artificial Ecosystem-based Optimization**
   * **OriginalAEO**: Zhao, W., Wang, L., & Zhang, Z. (2019). Artificial ecosystem-based optimization: a novel nature-inspired meta-heuristic algorithm. Neural Computing and Applications, 1-43.
-  * **AdaptiveAEO**: The adaptive version
+  * **AugmentedAEO**: Van Thieu, N., Barma, S. D., Van Lam, T., Kisi, O., & Mahesha, A. (2022). Groundwater level modeling using Augmented Artificial Ecosystem Optimization. Journal of Hydrology, 129034.
   * **ImprovedAEO**: Rizk-Allah, R. M., & El-Fergany, A. A. (2020). Artificial ecosystem optimizer for parameters identification of proton exchange membrane fuel cells model. International Journal of Hydrogen Energy.
   * **EnhancedAEO**: Eid, A., Kamel, S., Korashy, A., & Khurshaid, T. (2020). An Enhanced Artificial Ecosystem-Based Optimization for Optimal Allocation of Multiple Distributed Generations. IEEE Access, 8, 178493-178513.
   * **ModifiedAEO**: Menesy, A. S., Sultan, H. M., Korashy, A., Banakhr, F. A., Ashmawy, M. G., & Kamel, S. (2020). Effective parameter extraction of different polymer electrolyte membrane fuel cell stack models using a modified artificial ecosystem optimization algorithm. IEEE Access, 8, 31892-31909.

diff --git a/examples/run_all_parameters.py b/examples/run_all_parameters.py
@@ -800,7 +800,7 @@
 model = AEO.EnhancedAEO(**paras_aeo)
 model = AEO.ModifiedAEO(**paras_aeo)
 model = AEO.ImprovedAEO(**paras_aeo)
-model = AEO.AdaptiveAEO(**paras_aeo)
+model = AEO.AugmentedAEO(**paras_aeo)
 model = GCO.BaseGCO(**paras_aeo)
 model = GCO.OriginalGCO(**paras_aeo)
 model = WCA.OriginalWCA(**paras_wca)

diff --git a/mealpy/system_based/AEO.py b/mealpy/system_based/AEO.py
@@ -509,7 +509,7 @@ def evolve(self, epoch):
             self.pop = self.greedy_selection_population(pop_child, self.pop)
 
 
-class AdaptiveAEO(Optimizer):
+class AugmentedAEO(Optimizer):
     """
     The original version of: Adaptive Artificial Ecosystem Optimization (AAEO)
 
@@ -521,7 +521,7 @@ class AdaptiveAEO(Optimizer):
     Examples
     ~~~~~~~~
     >>> import numpy as np
-    >>> from mealpy.system_based.AEO import AdaptiveAEO
+    >>> from mealpy.system_based.AEO import AugmentedAEO
     >>>
     >>> def fitness_function(solution):
     >>>     return np.sum(solution**2)
@@ -535,13 +535,14 @@ class AdaptiveAEO(Optimizer):
     >>>
     >>> epoch = 1000
     >>> pop_size = 50
-    >>> model = AdaptiveAEO(epoch, pop_size)
+    >>> model = AugmentedAEO(epoch, pop_size)
     >>> best_position, best_fitness = model.solve(problem_dict1)
     >>> print(f"Solution: {best_position}, Fitness: {best_fitness}")
 
     References
     ~~~~~~~~~~
-    [1] Under Review
+    [1] Van Thieu, N., Barma, S. D., Van Lam, T., Kisi, O., & Mahesha, A. (2022). Groundwater level modeling
+    using Augmented Artificial Ecosystem Optimization. Journal of Hydrology, 129034.
     """
 
     def __init__(self, epoch=10000, pop_size=100, **kwargs):

diff --git a/tests/system_based/test_AEO.py b/tests/system_based/test_AEO.py
@@ -26,7 +26,7 @@ def fitness_function(solution):
 
 def test_AEO_results(problem):
     models = [
-        AEO.AdaptiveAEO(epoch=100, pop_size=50),
+        AEO.AugmentedAEO(epoch=100, pop_size=50),
         AEO.OriginalAEO(epoch=10, pop_size=50),
         AEO.ModifiedAEO(epoch=10, pop_size=50),
         AEO.EnhancedAEO(epoch=10, pop_size=50),