diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-06 08:55:09 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-12 09:41:28 +0200 |
commit | 0477e6c39b7ce8b7f6560fbf222c19fe4f358dc8 (patch) | |
tree | 218eba20dd23c6a865cf01aa7532bf1261a69bc8 /nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java | |
parent | e2e55a7c49079dfd896da6515b98d451e4c8735b (diff) |
java: add @Override annotation to overriding methods
Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
Diffstat (limited to 'nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java')
-rw-r--r-- | nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java | 7 |
1 files changed, 7 insertions, 0 deletions
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 7867fdb49db2..3c1a12a0be9b 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -3,8 +3,13 @@ #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) * @@ -46,6 +51,7 @@ public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { pbest_t = pbest; } + @Override public void generateBehavior(SearchPoint trailPoint, ProblemEncoder problemEncoder) { SearchPoint gbest_t = socialLib.getGbest(); @@ -66,6 +72,7 @@ public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { } } + @Override public void testBehavior(SearchPoint trailPoint, IGoodnessCompareEngine qualityComparator) { Library.replace(qualityComparator, trailPoint, pbest_t); } |