diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-12 15:50:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-18 08:07:14 +0000 |
| commit | 79c6aff069a9593571226bb32e907f837a203b7c (patch) | |
| tree | 618160ad21068242a4943ac866a43c032bb94205 /nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps | |
| parent | 2608512056b706bab57e36765e15f5c00668577a (diff) | |
java: fix some javadoc errors
Eclipse was flagging this text as "invalid javadoc tags"
Change-Id: I09e090c6cc49366191f96d34bd51f6ba68cf18aa
Reviewed-on: https://gerrit.libreoffice.org/12524
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps')
3 files changed, 10 insertions, 15 deletions
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java index b4b9b4ca6a5e..60f438cc637c 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java @@ -2,7 +2,7 @@ * Description: The description of generate-and-test behavior. * * - * @ Author Create/Modi Note + * Author Create/Modi Note * Xiaofeng Xie May 17, 2004 * Xiaofeng Xie Jul 01, 2008 * diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index 3e7b32e855fc..c9879c099e61 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -3,17 +3,12 @@ #Supported parameters: NAME VALUE_type Range DefaultV Description -<<<<<<< HEAD - FACTOR real (0, 1.2] 0.5 DEAgent: scale constant - CR real [0, 1] 0.9 DEAgent: crossover constant -======= FACTOR real (0, 1.2] 0.5 DEAgent: scale constant CR real [0, 1] 0.9 DEAgent: crossover constant ->>>>>>> java: add @Override annotation to overriding methods //Other choices for FACTOR and CR: (0.5, 0.1) * - * @ Author Create/Modi Note + * Author Create/Modi Note * Xiaofeng Xie May 11, 2004 * Xiaofeng Xie Jul 01, 2008 * @@ -24,7 +19,7 @@ * [1] Storn R, Price K. Differential evolution - a simple and efficient * heuristic for global optimization over continuous spaces. Journal of * Global Optimization, 1997, 11: 341-359 - * @ The original differential evolution idea + * The original differential evolution idea * [2] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical * optimization. Genetic and Evolutionary Computation Conference (GECCO), * Seattle, WA, USA, 2004: 238-250 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java index 19f1971f6c0c..546e9dd486a9 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java @@ -9,7 +9,7 @@ CL real [0, 0.1] 0 PSAgent: chaos factor //Other choices for c1, c2, w, and CL: (2, 2, 0.4, 0.001) - * @ Author Create/Modi Note + * Author Create/Modi Note * Xiaofeng Xie May 11, 2004 * Xiaofeng Xie Jul 01, 2008 * @@ -28,24 +28,24 @@ * @version 1.0 * @Since MAOS1.0 * - * @References: + * References: * [1] Kennedy J, Eberhart R C. Particle swarm optimization. IEEE Int. Conf. on * Neural Networks, Perth, Australia, 1995: 1942-1948 - * @ For original particle swarm idea + * For original particle swarm idea * [2] Shi Y H, Eberhart R C. A Modified Particle Swarm Optimizer. IEEE Inter. Conf. * on Evolutionary Computation, Anchorage, Alaska, 1998: 69-73 - * @ For the inertia weight: adjust the trade-off between exploitation & exploration + * For the inertia weight: adjust the trade-off between exploitation & exploration * [3] Clerc M, Kennedy J. The particle swarm - explosion, stability, and * convergence in a multidimensional complex space. IEEE Trans. on Evolutionary * Computation. 2002, 6 (1): 58-73 - * @ Constriction factor: ensures the convergence + * Constriction factor: ensures the convergence * [4] Xie X F, Zhang W J, Yang Z L. A dissipative particle swarm optimization. * Congress on Evolutionary Computation, Hawaii, USA, 2002: 1456-1461 - * @ The CL parameter + * The CL parameter * [5] Xie X F, Zhang W J, Bi D C. Optimizing semiconductor devices by self- * organizing particle swarm. Congress on Evolutionary Computation, Oregon, USA, * 2004: 2017-2022 - * @ Further experimental analysis on the convergence of PSO + * Further experimental analysis on the convergence of PSO * [6] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical * optimization. Genetic and Evolutionary Computation Conference (GECCO), * Seattle, WA, USA, 2004: 238-250 |